Merge "Create post-deploy.conf on update/upgrade for octavia"

deployment/octavia/octavia-api-container-puppet.yaml

@@ -403,56 +403,61 @@ outputs:
             content: |
               d /run/octavia 0755 root root - -
       update_tasks:
-        - name: octavia_api_tmpfile_cleanup
-          when: step|int == 1
-          block: &octavia_api_tmpfile_cleanup
-            - name: octavia_api_tmpfile_cleanup
-              file:
-                path: /etc/tmpfiles.d/var-run-octavia.conf
-                state: absent
-        - name: Set internal tls variable
-          set_fact:
-            internal_tls_enabled: {get_param: EnableInternalTLS}
-        - name: remove TLS proxy if configured and running
-          when:
-            - step|int == 2
-            - internal_tls_enabled|bool
-          block: &remove_octavia_tls_proxy_tasks
-            - name: stop and remove octavia_api_tls_proxy container if docker
-              docker:
-                name: octavia_api_tls_proxy
-                state: absent
-              when: container_cli == 'docker'
-            - name: "check if tripleo_octavia_api_tls_proxy service exists in systemd"
-              stat:
-                path: "/etc/systemd/system/tripleo_octavia_api_tls_proxy.service"
-              register: systemd_exists
-            - name: Remove tripleo_octavia_api_tls_proxy service
-              when:
-                - container_cli == 'podman'
-                - systemd_exists.stat.exists
-              block:
-                - name: stop and disable octavia_api_tls_proxy container
-                  systemd:
-                    name: tripleo_octavia_api_tls_proxy
-                    state: stopped
-                    enabled: no
-                - name: clean up tripleo service file for octavia_api_tls_proxy
+        list_concat:
+          - {get_attr: [OctaviaBase, update_tasks]}
+          - - name: octavia_api_tmpfile_cleanup
+              when: step|int == 1
+              block: &octavia_api_tmpfile_cleanup
+                - name: octavia_api_tmpfile_cleanup
                   file:
+                    path: /etc/tmpfiles.d/var-run-octavia.conf
                     state: absent
+            - name: Set internal tls variable
+              set_fact:
+                internal_tls_enabled: {get_param: EnableInternalTLS}
+            - name: remove TLS proxy if configured and running
+              when:
+                - step|int == 2
+                - internal_tls_enabled|bool
+              block: &remove_octavia_tls_proxy_tasks
+                - name: stop and remove octavia_api_tls_proxy container if docker
+                  docker:
+                    name: octavia_api_tls_proxy
+                    state: absent
+                  when: container_cli == 'docker'
+                - name: "check if tripleo_octavia_api_tls_proxy service exists in systemd"
+                  stat:
                     path: "/etc/systemd/system/tripleo_octavia_api_tls_proxy.service"
-                - name: reload systemd
-                  systemd:
-                    daemon-reload: yes
+                  register: systemd_exists
+                - name: Remove tripleo_octavia_api_tls_proxy service
+                  when:
+                    - container_cli == 'podman'
+                    - systemd_exists.stat.exists
+                  block:
+                    - name: stop and disable octavia_api_tls_proxy container
+                      systemd:
+                        name: tripleo_octavia_api_tls_proxy
+                        state: stopped
+                        enabled: no
+                    - name: clean up tripleo service file for octavia_api_tls_proxy
+                      file:
+                        state: absent
+                        path: "/etc/systemd/system/tripleo_octavia_api_tls_proxy.service"
+                    - name: reload systemd
+                      systemd:
+                        daemon-reload: yes
+
       upgrade_tasks:
-        - name: octavia_api_tmpfile_cleanup
-          when: step|int == 1
-          block: *octavia_api_tmpfile_cleanup
-        - name: Set internal tls variable
-          set_fact:
-            internal_tls_enabled: {get_param: EnableInternalTLS}
-        - name: remove TLS proxy if configured and running
-          when:
-            - step|int == 2
-            - internal_tls_enabled|bool
-          block: *remove_octavia_tls_proxy_tasks
+        list_concat:
+          - {get_attr: [OctaviaBase, upgrade_tasks]}
+          - - name: octavia_api_tmpfile_cleanup
+              when: step|int == 1
+              block: *octavia_api_tmpfile_cleanup
+            - name: Set internal tls variable
+              set_fact:
+                internal_tls_enabled: {get_param: EnableInternalTLS}
+            - name: remove TLS proxy if configured and running
+              when:
+                - step|int == 2
+                - internal_tls_enabled|bool
+              block: *remove_octavia_tls_proxy_tasks

deployment/octavia/octavia-base.yaml

@@ -308,3 +308,19 @@ outputs:
             - octavia_client_cert_unset
             - {}
             - octavia::certificates::client_cert_data: {get_param: OctaviaClientCert}
+      update_tasks: &ensure_start_up_files
+        - name: make sure that post-deploy.conf exists before restarting containers on update or upgrade
+          block:
+            - name: check for octavia post-deploy.conf file
+              stat:
+                path: /var/lib/config-data/puppet-generated/octavia/etc/octavia/post-deploy.conf
+              register: octavia_post_deploy_stat
+            - name: create an empty post-deploy.conf file if it does not exist
+              file:
+                path: /var/lib/config-data/puppet-generated/octavia/etc/octavia/post-deploy.conf
+                state: touch
+                setype: container_file_t
+                mode: '0755'
+              when:
+                - octavia_post_deploy_stat.exists is defined and not octavia_post_deploy_stat.exists
+      upgrade_tasks: *ensure_start_up_files

deployment/octavia/octavia-health-manager-container-puppet.yaml

@@ -195,7 +195,8 @@ outputs:
                     environment:
                       KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
                 - {}
-
+      update_tasks: {get_attr: [OctaviaBase, update_tasks]}
+      upgrade_tasks: {get_attr: [OctaviaBase, upgrade_tasks]}
       host_prep_tasks:
         - name: create persistent directories
           file:

deployment/octavia/octavia-housekeeping-container-puppet.yaml

@@ -147,6 +147,8 @@ outputs:
                   - /var/log/containers/octavia:/var/log/octavia:z
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
+      update_tasks: {get_attr: [OctaviaBase, update_tasks]}
+      upgrade_tasks: {get_attr: [OctaviaBase, upgrade_tasks]}
       host_prep_tasks:
         - name: create persistent directories
           file:
@@ -156,4 +158,3 @@ outputs:
             mode: "{{ item.mode }}"
           with_items:
             - { 'path': /var/log/containers/octavia, 'setype': container_file_t, 'mode': '0750' }
-      upgrade_tasks: []

deployment/octavia/octavia-worker-container-puppet.yaml

@@ -167,4 +167,5 @@ outputs:
             name: virt_sandbox_use_netlink
             persistent: yes
             state: yes
-      upgrade_tasks: []
+      update_tasks: {get_attr: [OctaviaBase, update_tasks]}
+      upgrade_tasks: {get_attr: [OctaviaBase, upgrade_tasks]}