Merge "Allow for optinal volumes and env variables"

docker/services/heat-api.yaml

@@ -40,6 +40,14 @@ parameters:
   EnableInternalTLS:
     type: boolean
     default: false
+  HeatApiOptVolumes:
+    default: []
+    description: list of optional volumes to be mounted
+    type: comma_delimited_list
+  HeatApiOptEnvVars:
+    default: []
+    description: list of optional environment variables
+    type: comma_delimited_list
 
 conditions:
 
@@ -124,6 +132,7 @@ outputs:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
                 - {get_attr: [HeatApiLogging, volumes]}
+                - {get_param: HeatApiOptVolumes}
                 -
                   - /var/lib/kolla/config_files/heat_api.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/heat_api/:/var/lib/kolla/config_files/src:ro
@@ -138,7 +147,10 @@ outputs:
                       - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                       - ''
             environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                  list_concat:
+                    - {get_param: HeatApiOptEnvVars}
+                    -
+                      - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           heat_api_cron:
             image: {get_param: DockerHeatApiImage}
             net: host

docker/services/neutron-api.yaml

@@ -43,6 +43,14 @@ parameters:
     default: false
     description: Remove package if the service is being disabled during upgrade
     type: boolean
+  NeutronApiOptVolumes:
+    default: []
+    description: list of optional volumes to be mounted
+    type: comma_delimited_list
+  NeutronApiOptEnvVars:
+    default: []
+    description: list of optional environment variables
+    type: comma_delimited_list
 
 conditions:
 
@@ -144,11 +152,15 @@ outputs:
                   list_concat:
                     - {get_attr: [ContainersCommon, volumes]}
                     - {get_attr: [NeutronLogging, volumes]}
+                    - {get_param: NeutronApiOptVolumes}
                     -
                       - /var/lib/kolla/config_files/neutron_api.json:/var/lib/kolla/config_files/config.json:ro
                       - /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
                 environment:
-                  - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                  list_concat:
+                    - {get_param: NeutronApiOptEnvVars}
+                    -
+                      - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
             - if:
                 - internal_tls_enabled
                 - neutron_server_tls_proxy:

docker/services/nova-compute.yaml

@@ -52,6 +52,14 @@ parameters:
   CephClientUserName:
     default: openstack
     type: string
+  NovaComputeOptVolumes:
+    default: []
+    description: list of optional vo
+    type: comma_delimited_list
+  NovaComputeOptEnvVars:
+    default: []
+    description: list of optional en
+    type: comma_delimited_list
 
 resources:
 
@@ -147,6 +155,7 @@ outputs:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
                 - {get_attr: [NovaLogging, volumes]}
+                - {get_param: NovaComputeOptVolumes}
                 -
                   - /var/lib/kolla/config_files/nova_compute.json:/var/lib/kolla/config_files/config.json:ro
                   - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro
@@ -160,7 +169,10 @@ outputs:
                   - /sys/class/net:/sys/class/net
                   - /sys/bus/pci:/sys/bus/pci
             environment:
-             - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              list_concat:
+                - {get_param: NovaComputeOptEnvVars}
+                -
+                  - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
         list_concat:
         - {get_attr: [NovaLogging, host_prep_tasks]}

releasenotes/notes/bug-1741464-78403f89e9dc5d75.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    This patch allows to attach optional volumes to and set optional
+    environment variables in the neutron-api, heat-api and nova-compute
+    containers. This makes it easier to plug plugins to that containers.