Skip to content

Avoid merge conflicts during upgrades #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 6, 2024
Merged

Avoid merge conflicts during upgrades #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9366435
Upgrade: show stashed changes when git stash pop fails
markgoddard Aug 27, 2024
66e35d8
Make adding internal TLS config to globals.yml idempotent
markgoddard Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 24 additions & 5 deletions ansible/deploy-openstack-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,30 @@
dest: "{{ src_directory }}/{{ kayobe_config_name }}"
update: "{{ upgrade | bool }}"

- name: Pop stashed Kayobe Config changes (upgrade)
ansible.builtin.command:
cmd: git stash pop
chdir: "{{ src_directory }}/{{ kayobe_config_name }}"
when: upgrade | bool
- when: upgrade
block:
- name: Pop stashed Kayobe Config changes (upgrade)
ansible.builtin.command:
cmd: git stash pop
chdir: "{{ src_directory }}/{{ kayobe_config_name }}"
register: pop_result
# NOTE: Fails when no stash exists
failed_when:
- pop_result is failure
- "'No stash entries found' not in pop_result.stderr"
rescue:
- name: Check Kayobe Config diff (upgrade)
ansible.builtin.command:
cmd: git diff
chdir: "{{ src_directory }}/{{ kayobe_config_name }}"
register: diff_result

- name: Fail on git stash pop failure
ansible.builtin.fail:
msg: |-
Failed to pop stashed changes after upgrade.

{{ diff_result.stdout }}

- name: Replace TLS changes to avoid git conflicts (upgrade)
ansible.builtin.shell:
Expand Down
7 changes: 6 additions & 1 deletion ansible/files/multinode.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,12 @@ function generate_overcloud_certs() {
# NOTE: Previously it was necessary to first deploy HAProxy with TLS disabled.
if [[ -f $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/globals-tls-config.yml ]]; then
sed -i 's/# kolla_enable_tls_internal: true/kolla_enable_tls_internal: true/g' $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla.yml
cat $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/globals-tls-config.yml >> $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/globals.yml
# This condition provides some level of idempotency, as well as supporting
# the case where the content of globals-tls-config.yml has been added to
# globals.yml within a conditional check for internal TLS.
if ! grep kolla_copy_ca_into_containers $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/globals-tls-config.yml &>/dev/null; then
cat $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/globals-tls-config.yml >> $KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/globals.yml
fi
fi
}

Expand Down