Simplify octavia post deploy configs

Consolidate post deploy configurations in a single file. Octavia
controller services share many configurations. It is best to consolidate
them in the same configuration file. This fixes problems seen like
amphorae not having the controller_ip_port_list config value set on
failover triggered by the Health Manager service as that config was only
being loaded for the Worker service.

Closes-Bug: #1836074
Depends-On: https://review.opendev.org/#/c/689872/

Change-Id: I32524f85ef6a0ca3e87fa9acc8c9e12776225717
(cherry picked from commit c2bb9c0937)

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

@@ -104,7 +104,7 @@ outputs:
         config_image: {get_param: ContainerOctaviaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/octavia_health_manager.json:
-          command: /usr/bin/octavia-health-manager --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/health-manager.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-health-manager
+          command: /usr/bin/octavia-health-manager --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/health-manager.log --config-dir /etc/octavia/conf.d/octavia-health-manager
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
@@ -171,3 +171,14 @@ outputs:
             containers_to_rm:
               - octavia_health_manager
             tripleo_container_cli: "docker"
+        - name: remove directory /etc/octavia/conf.d/common
+          when: step|int == 5
+          file:
+            path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common"
+            state: absent
+      post_update_tasks:
+        - name: remove directory /etc/octavia/conf.d/common
+          when: step|int == 5
+          file:
+            path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common"
+            state: absent

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

@@ -103,7 +103,7 @@ outputs:
         config_image: {get_param: ContainerOctaviaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/octavia_housekeeping.json:
-          command: /usr/bin/octavia-housekeeping --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/housekeeping.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-housekeeping
+          command: /usr/bin/octavia-housekeeping --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/housekeeping.log --config-dir /etc/octavia/conf.d/octavia-housekeeping
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
@@ -171,3 +171,14 @@ outputs:
             containers_to_rm:
               - octavia_housekeeping
             tripleo_container_cli: "docker"
+        - name: remove directory /etc/octavia/conf.d/common
+          when: step|int == 5
+          file:
+            path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common"
+            state: absent
+      post_update_tasks:
+        - name: remove directory /etc/octavia/conf.d/common
+          when: step|int == 5
+          file:
+            path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common"
+            state: absent

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

@@ -91,7 +91,7 @@ outputs:
         config_image: {get_param: ContainerOctaviaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/octavia_worker.json:
-          command: /usr/bin/octavia-worker --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/worker.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-worker
+          command: /usr/bin/octavia-worker --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/worker.log --config-dir /etc/octavia/conf.d/octavia-worker
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
@@ -171,3 +171,14 @@ outputs:
             containers_to_rm:
               - octavia_worker
             tripleo_container_cli: "docker"
+        - name: remove directory /etc/octavia/conf.d/common
+          when: step|int == 5
+          file:
+            path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common"
+            state: absent
+      post_update_tasks:
+        - name: remove directory /etc/octavia/conf.d/common
+          when: step|int == 5
+          file:
+            path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common"
+            state: absent

releasenotes/notes/consolidate-octavia-post-deploy-configs-bc251a5446e5615d.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixed an issue where Octavia controller services were not properly
+    configured.