Merge "Make NovaComputeOptVolumes and NovaComputeOptEnvVars role aware"

openstack-archive · Oct 23, 2020 · eb53dd1 · eb53dd1
2 parents 6b53c94 + 1471976
commit eb53dd1
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
@@ -61,10 +61,14 @@ parameters:
     default: []
     description: list of optional volumes to be mounted
     type: comma_delimited_list
+    tags:
+      - role_specific
   NovaComputeOptEnvVars:
     default: {}
     description: hash of optional environment variables
     type: json
+    tags:
+      - role_specific
   EnableInstanceHA:
     default: false
     description: Whether to enable an Instance Ha configurarion or not.
@@ -594,6 +598,8 @@ resources:
               nova::compute::libvirt::cpu_mode: NovaLibvirtCPUMode
               nova::compute::libvirt::cpu_models: NovaLibvirtCPUModels
               nova::compute::libvirt::cpu_model_extra_flags: NovaLibvirtCPUModelExtraFlags
+              nova_compute_opt_volumes: NovaComputeOptVolumes
+              nova_compute_opt_env_vars: NovaComputeOptEnvVars
             - values: {get_param: [RoleParameters]}
           - values:
               NovaVcpuPinSet: {get_param: NovaVcpuPinSet}
@@ -675,6 +681,8 @@ resources:
               NovaLibvirtCPUMode: {get_param: NovaLibvirtCPUMode}
               NovaLibvirtCPUModels: {get_param: NovaLibvirtCPUModels}
               NovaLibvirtCPUModelExtraFlags: {get_param: NovaLibvirtCPUModelExtraFlags}
+              NovaComputeOptVolumes: {get_param: NovaComputeOptVolumes}
+              NovaComputeOptEnvVars: {get_param: NovaComputeOptEnvVars}
 
 
 conditions:
@@ -917,7 +925,7 @@ outputs:
                   list_concat:
                     - {get_attr: [ContainersCommon, volumes]}
                     - {get_attr: [NovaLogging, volumes]}
-                    - {get_param: NovaComputeOptVolumes}
+                    - {get_attr: [RoleParametersValue, value, nova_compute_opt_volumes]}
                     -
                       - /etc/ssh/ssh_known_hosts:/etc/ssh/ssh_known_hosts:ro
                       - /var/lib/kolla/config_files/nova_compute.json:/var/lib/kolla/config_files/config.json:ro
@@ -941,7 +949,7 @@ outputs:
                       - []
                 environment:
                   map_merge:
-                    - {get_param: NovaComputeOptEnvVars}
+                    - {get_attr: [RoleParametersValue, value, nova_compute_opt_env_vars]}
                     - KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
                     - LIBGUESTFS_BACKEND: libvirt:qemu:///system
             - if: