Make NovaComputeOptVolumes and NovaComputeOptEnvVars role aware
Since multiple types of computes can be deployed, we should allow the customization of these containers to be role specific. Change-Id: Ie91633c2bcc8011cc62b46452ea5b444cf12029f
This commit is contained in:
parent
cce08b7a43
commit
1471976c6e
|
@ -61,10 +61,14 @@ parameters:
|
||||||
default: []
|
default: []
|
||||||
description: list of optional volumes to be mounted
|
description: list of optional volumes to be mounted
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
|
tags:
|
||||||
|
- role_specific
|
||||||
NovaComputeOptEnvVars:
|
NovaComputeOptEnvVars:
|
||||||
default: {}
|
default: {}
|
||||||
description: hash of optional environment variables
|
description: hash of optional environment variables
|
||||||
type: json
|
type: json
|
||||||
|
tags:
|
||||||
|
- role_specific
|
||||||
EnableInstanceHA:
|
EnableInstanceHA:
|
||||||
default: false
|
default: false
|
||||||
description: Whether to enable an Instance Ha configurarion or not.
|
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_mode: NovaLibvirtCPUMode
|
||||||
nova::compute::libvirt::cpu_models: NovaLibvirtCPUModels
|
nova::compute::libvirt::cpu_models: NovaLibvirtCPUModels
|
||||||
nova::compute::libvirt::cpu_model_extra_flags: NovaLibvirtCPUModelExtraFlags
|
nova::compute::libvirt::cpu_model_extra_flags: NovaLibvirtCPUModelExtraFlags
|
||||||
|
nova_compute_opt_volumes: NovaComputeOptVolumes
|
||||||
|
nova_compute_opt_env_vars: NovaComputeOptEnvVars
|
||||||
- values: {get_param: [RoleParameters]}
|
- values: {get_param: [RoleParameters]}
|
||||||
- values:
|
- values:
|
||||||
NovaVcpuPinSet: {get_param: NovaVcpuPinSet}
|
NovaVcpuPinSet: {get_param: NovaVcpuPinSet}
|
||||||
|
@ -675,6 +681,8 @@ resources:
|
||||||
NovaLibvirtCPUMode: {get_param: NovaLibvirtCPUMode}
|
NovaLibvirtCPUMode: {get_param: NovaLibvirtCPUMode}
|
||||||
NovaLibvirtCPUModels: {get_param: NovaLibvirtCPUModels}
|
NovaLibvirtCPUModels: {get_param: NovaLibvirtCPUModels}
|
||||||
NovaLibvirtCPUModelExtraFlags: {get_param: NovaLibvirtCPUModelExtraFlags}
|
NovaLibvirtCPUModelExtraFlags: {get_param: NovaLibvirtCPUModelExtraFlags}
|
||||||
|
NovaComputeOptVolumes: {get_param: NovaComputeOptVolumes}
|
||||||
|
NovaComputeOptEnvVars: {get_param: NovaComputeOptEnvVars}
|
||||||
|
|
||||||
|
|
||||||
conditions:
|
conditions:
|
||||||
|
@ -917,7 +925,7 @@ outputs:
|
||||||
list_concat:
|
list_concat:
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
- {get_attr: [NovaLogging, 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
|
- /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
|
- /var/lib/kolla/config_files/nova_compute.json:/var/lib/kolla/config_files/config.json:ro
|
||||||
|
@ -941,7 +949,7 @@ outputs:
|
||||||
- []
|
- []
|
||||||
environment:
|
environment:
|
||||||
map_merge:
|
map_merge:
|
||||||
- {get_param: NovaComputeOptEnvVars}
|
- {get_attr: [RoleParametersValue, value, nova_compute_opt_env_vars]}
|
||||||
- KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
- KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||||
- LIBGUESTFS_BACKEND: libvirt:qemu:///system
|
- LIBGUESTFS_BACKEND: libvirt:qemu:///system
|
||||||
- if:
|
- if:
|
||||||
|
|
Loading…
Reference in New Issue