Merge pull request #70 from stackhpc/fix-upgrade-stashing

Avoid merge conflicts during upgrades

Author: markgoddard

ansible/deploy-openstack-config.yml

@@ -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:

ansible/files/multinode.sh

@@ -182,7 +182,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
 }