Merge "Ensure octavia flavor gets configured if composable octavia"

docker/services/octavia-api.yaml

@@ -68,12 +68,25 @@ resources:
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
 
+  OctaviaFlavor:
+    type: ../../puppet/services/octavia-worker.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
+
 outputs:
   role_data:
     description: Role data for the Octavia API role.
     value:
       service_name: {get_attr: [OctaviaApiPuppetBase, role_data, service_name]}
-      config_settings: {get_attr: [OctaviaApiPuppetBase, role_data, config_settings]}
+      config_settings:
+        map_merge:
+          - {get_attr: [OctaviaApiPuppetBase, role_data, config_settings]}
+          - {get_attr: [OctaviaFlavor, role_data, config_settings]}
       service_config_settings:
         map_merge:
           - get_attr: [OctaviaApiPuppetBase, role_data, service_config_settings]
@@ -111,6 +124,15 @@ outputs:
               dest: "/"
               merge: true
               preserve_properties: true
+      docker_puppet_tasks:
+        step_5:
+          config_volume: octavia
+          puppet_tags: nova_flavor
+          step_config:
+            get_attr: [OctaviaFlavor, role_data, step_config]
+          config_image: {get_param: DockerOctaviaConfigImage}
+          volumes:
+            - /var/lib/config-data/puppet-generated/nova/etc/nova:/etc/nova:ro
       docker_config:
         # Kolla_bootstrap/db_sync runs before permissions set by kolla_config
         step_2:

docker/services/octavia-worker.yaml

@@ -140,15 +140,6 @@ outputs:
                   - /var/log/containers/octavia:/var/log/octavia:z
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-      docker_puppet_tasks:
-        step_5:
-          config_volume: octavia
-          puppet_tags: nova_flavor
-          step_config:
-            get_attr: [OctaviaWorkerPuppetBase, role_data, step_config]
-          config_image: {get_param: DockerOctaviaConfigImage}
-          volumes:
-            - /var/lib/config-data/puppet-generated/nova/etc/nova:/etc/nova:ro
       host_prep_tasks:
         - name: create persistent logs directory
           file: