Refactor deploy-openstack.sh into multinode.sh

Drop Terraform templating to make it easier to understand and maintain.

Provide multiple script entry points to make it easier to perform
different operations. The previous behaviour is maintained as a
'deploy_full' command.

Add support for upgrading the overcloud with an 'upgrade_overcloud'
command.

Author: markgoddard

ansible/deploy-openstack-config.yml

@@ -63,18 +63,57 @@
         state: present
       become: true
 
+    - name: Ensure uuid-runtime is present (Ubuntu)
+      ansible.builtin.package:
+        name: uuid-runtime
+        state: present
+      become: true
+      when: ansible_facts['distribution'] == "Ubuntu"
+
     - name: Ensure `source` directory exists
       ansible.builtin.file:
         path: "{{ src_directory }}"
         state: directory
         mode: "0755"
 
+    - name: Revert TLS changes to avoid git conflicts (upgrade)
+      ansible.builtin.shell:
+        cmd: >-
+          if [[ -f {{ kayobe_environment_path }}/kolla/globals-tls-config.yml ]]; then
+            sed -i 's/^kolla_enable_tls_internal: true/# kolla_enable_tls_internal: true/g' {{ kayobe_environment_path }}/kolla.yml
+          fi
+      when: upgrade | bool
+      vars:
+        kayobe_environment_path: "{{ src_directory }}/kayobe-config/etc/kayobe/environments/{{ kayobe_config_environment }}"
+
+    - name: Stash Kayobe Config changes (upgrade)
+      ansible.builtin.command:
+        cmd: git stash
+        chdir: "{{ src_directory }}/{{ kayobe_config_name }}"
+      when: upgrade | bool
+
     - name: Ensure Kayobe Config repository is present
       ansible.builtin.git:
         repo: "{{ kayobe_config_repo }}"
         version: "{{ kayobe_config_version }}"
         dest: "{{ src_directory }}/{{ kayobe_config_name }}"
-        update: false
+        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
+
+    - name: Replace TLS changes to avoid git conflicts (upgrade)
+      ansible.builtin.shell:
+        cmd: >-
+          if [[ -f {{ kayobe_environment_path }}/kolla/globals-tls-config.yml ]]; then
+            sed -i 's/# kolla_enable_tls_internal: true/kolla_enable_tls_internal: true/g' {{ kayobe_environment_path }}/kolla.yml
+          fi
+      when: upgrade | bool
+      vars:
+        kayobe_environment_path: "{{ src_directory }}/kayobe-config/etc/kayobe/environments/{{ kayobe_config_environment }}"
 
     - name: Ensure hooks directory are present
       ansible.builtin.file:
@@ -103,7 +142,6 @@
         - { src: fix-networking.yml, dest: infra-vm-host-configure/pre.d/15-fix-networking.yml }
         - { src: configure-vxlan.yml, dest: infra-vm-host-configure/pre.d/20-configure-vxlan.yml }
 
-
     - name: Ensure Admin Overcloud Network file is present
       ansible.builtin.copy:
         src: "files/admin-oc-networks.yml"
@@ -116,6 +154,15 @@
         dest: "{{ src_directory }}/{{ kayobe_config_name }}/etc/kayobe/environments/{{ kayobe_config_environment }}/inventory/hosts"
         mode: "0644"
 
+    - name: Ensure multinode.sh script is present
+      ansible.builtin.copy:
+        src: "files/multinode.sh"
+        dest: "/usr/local/bin/multinode.sh"
+        mode: "0755"
+      become: true
+      tags:
+        - multinode.sh
+
     - name: Ensure root_domain is defined
       ansible.builtin.lineinfile:
         path: "{{ src_directory }}/{{ kayobe_config_name }}/etc/kayobe/environments/{{ kayobe_config_environment }}/inventory/group_vars/all/main.yml"
@@ -162,9 +209,15 @@
         repo: "{{ kayobe_repo }}"
         version: "{{ kayobe_version or 'stackhpc/' ~ openstack_release.stdout }}"
         dest: "{{ src_directory }}/{{ kayobe_name }}"
-        update: false
+        update: "{{ upgrade | bool }}"
       when: kayobe_src_required
 
+    - name: Ensure `venvs` directory is absent (upgrade)
+      ansible.builtin.file:
+        path: "{{ ansible_env.HOME }}/venvs"
+        state: absent
+      when: upgrade | bool
+
     - name: Ensure `venvs` directory exists
       ansible.builtin.file:
         path: "{{ ansible_env.HOME }}/venvs"
@@ -231,6 +284,15 @@
         key: "{{ item }}"
       loop: "{{ extra_ssh_public_keys }}"
 
+    - name: "{% if upgrade | bool %}Upgrade{% else %}Bootstrap{% endif %} control host"
+      ansible.builtin.shell:
+        cmd: |-
+          set -eu
+          source {{ ansible_env.HOME }}/venvs/kayobe/bin/activate
+          source {{ src_directory }}/{{ kayobe_config_name }}/kayobe-env --environment {{ kayobe_config_environment }}
+          export KAYOBE_VAULT_PASSWORD="$(cat ~/vault.password)"
+          kayobe control host {% if upgrade | bool %}upgrade{% else %}bootstrap{% endif %}
+
     - name: Ensure OpenStack Config repository is present
       ansible.builtin.git:
         repo: "{{ openstack_config_repo }}"
@@ -278,13 +340,6 @@
         dest: "{{ src_directory }}/{{ openstack_config_name }}/ansible/inventory"
         mode: 0644
 
-    - name: Ensure `deploy-openstack.sh` script is present
-      ansible.builtin.copy:
-        src: "files/deploy-openstack.sh"
-        dest: "{{ ansible_env.HOME }}/deploy-openstack.sh"
-        mode: "755"
-      tags: deploy-openstack
-
     - name: Ensure docker repository is present
       ansible.builtin.command:
         cmd: dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo

ansible/deploy-openstack.yml

@@ -3,6 +3,7 @@
   hosts: ansible_control
   gather_facts: false
   vars:
+    multinode_command: "deploy_full"
     # 6 hours should be enough...
     deployment_timeout_s: "{{ 6 * 60 * 60 }}"
     lock_path: /tmp/deploy-openstack.lock
@@ -30,7 +31,7 @@
         pipe-pane -t {{ tmux_session }} -o 'cat >> ~/tmux.#S:#P.log'
       when: session_check.rc != 0
 
-    # deploy-openstack.sh uses a "lock" directory to ensure that only one
+    # multinode.sh uses a "lock" directory to ensure that only one
     # instance can run concurrently.
     - name: Check that no deployment is in progress
       stat:
@@ -45,9 +46,9 @@
           directory and run this playbook again.
       when: lock_stat.stat.exists
 
-    - name: Run deploy-openstack.sh in tmux window
+    - name: "Run multinode.sh {{ multinode_command }} in tmux window"
       command: >-
-        tmux send -t {{ tmux_session }}.0 './deploy-openstack.sh' ENTER
+        tmux send -t {{ tmux_session }}.0 'multinode.sh {{ multinode_command }}' ENTER
 
     - name: Show how to follow deployment progress
       debug:
@@ -57,11 +58,11 @@
 
           {{ connection_info }}
 
-    - name: Wait for deploy-openstack.sh to start
+    - name: "Wait for multinode.sh {{ multinode_command }} to start"
       pause:
         seconds: 30
 
-    - name: Wait for deployment to complete
+    - name: "Wait for multinode.sh {{ multinode_command }} to complete"
       stat:
         path: "{{ lock_path }}"
       register: lock_stat
@@ -70,13 +71,13 @@
       delay: 10
       failed_when: false
 
-    # deploy-openstack.sh writes an exit code to a file. 0 is success
-    - name: Check deployment result
+    # multinode.sh writes an exit code to a file. 0 is success
+    - name: "Check multinode.sh {{ multinode_command }} result"
       slurp:
         path: "{{ rc_path }}"
       register: rc_slurp
 
-    - name: Fail if deployment was unsuccessful
+    - name: "Fail if multinode.sh {{ multinode_command }} was unsuccessful"
       fail:
         msg: |
           Deployment or testing of OpenStack was unsuccessful.