From 7d533b77370311926e23b18ef6dbdbf2c3dcac01 Mon Sep 17 00:00:00 2001
From: Brent Eagles <beagles@redhat.com>
Date: Thu, 11 Oct 2018 10:34:48 -0230
Subject: [PATCH] Ensure octavia flavor gets configured if composable octavia

The octavia service templates configure the octavia flavor through the
controller-worker is deployed on a node other than the controller. Since
this uses docker_puppet_tasks, it is only run on the bootstrap node
which at the moment means the first controller. This patch moves the
flavor creation to the docker API template to make sure the flavor gets
created when deploying worker components in an non-standard role.

Closes-Bug: #1797443

Change-Id: Id823672b82ea60f355d1f01068f802567d687da5
---
 docker/services/octavia-api.yaml    | 24 +++++++++++++++++++++++-
 docker/services/octavia-worker.yaml |  9 ---------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/docker/services/octavia-api.yaml b/docker/services/octavia-api.yaml
index 2a700b353c..3ae9e29e61 100644
--- a/docker/services/octavia-api.yaml
+++ b/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]
@@ -107,6 +120,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:
diff --git a/docker/services/octavia-worker.yaml b/docker/services/octavia-worker.yaml
index 47b3d8da67..6d2c3f338d 100644
--- a/docker/services/octavia-worker.yaml
+++ b/docker/services/octavia-worker.yaml
@@ -132,15 +132,6 @@ outputs:
                   - /var/log/containers/octavia:/var/log/octavia
             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: