Fix order of Openstack post-deploy actions

Need to unseal vault before configure script it run.
canonical · Dec 16, 2024 · 508505c · 508505c
1 parent 9380901
commit 508505c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/common/helpers b/common/helpers
@@ -821,15 +821,15 @@ print_msgs ()
                 prev_key=$key
                 if ((count==max-1)); then
                     echo -e "\n[$prev_key]"
-                    echo "  - ${msg}"
+                    echo -e "  - ${msg}"
                 fi
             elif [ "$prev_key" != "$key" ] || ((count==max-1)); then
                 echo -e "\n[$prev_key]"
                 # we need to do this in order to preserve order
-                for _msg in "${msg_cache[@]}"; do echo "  - ${_msg}"; done
+                for _msg in "${msg_cache[@]}"; do echo -e "  - ${_msg}"; done
                 msg_cache=()
                 prev_key=$key
-                ((count==max-1)) && echo "  - ${msg}"
+                ((count==max-1)) && echo -e "  - ${msg}"
             fi
             msg_cache[$idx]=$msg
             ((count+=1))

diff --git a/openstack/pipeline/02configure b/openstack/pipeline/02configure
@@ -637,7 +637,7 @@ do
                 done
             fi
             has_opt --ceph && MOD_OVERLAYS+=( "ceph/vault-ceph.yaml" )
-            MOD_MSGS[vault.0]="run ./tools/vault-unseal-and-authorise.sh"
+            MOD_MSGS[0_common.0]="run ./tools/vault-unseal-and-authorise.sh\n  - ${MOD_MSGS[0_common.0]}"
             ;;
         --etcd-channel)  #__OPT__type:<str>
             MOD_PARAMS[__ETCD_SNAP_CHANNEL__]=$2