Merge "Re-add amphora flavor management settings"

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

@@ -69,6 +69,17 @@ parameters:
       e.g. { octavia-context_is_admin: { key: context_is_admin, value: 'role:admin' } }
     default: {}
     type: json
+  OctaviaFlavorProperties:
+    default:
+      ram  : '1024'
+      disk : '3'
+      vcpus: '1'
+    description: Dictionary describing the nova flavor for amphora.
+    type: json
+  OctaviaManageNovaFlavor:
+    default: true
+    description: Configure the nova flavor for the amphora.
+    type: boolean
 
 conditions:
 
@@ -119,6 +130,8 @@ outputs:
             octavia::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
             octavia::keystone::authtoken::project_name: {get_param: OctaviaProjectName}
             octavia::keystone::authtoken::password: {get_param: OctaviaPassword}
+            octavia::worker::manage_nova_flavor: {get_param: OctaviaManageNovaFlavor}
+            octavia::worker::nova_flavor_config: {get_param: OctaviaFlavorProperties}
             octavia::api::sync_db: true
             octavia::api::service_name: 'httpd'
             octavia::wsgi::apache::ssl: {get_param: EnableInternalTLS}
@@ -205,8 +218,8 @@ outputs:
         step_5:
           config_volume: octavia
           puppet_tags: nova_flavor
-          step_config:
-            get_attr: [OctaviaWorker, role_data, step_config]
+          step_config: |
+            include ::octavia::worker
           config_image: {get_param: DockerOctaviaConfigImage}
           volumes:
             - /var/lib/config-data/puppet-generated/nova/etc/nova:/etc/nova:ro