Merge "Make NovaComputeOptVolumes and NovaComputeOptEnvVars role aware" into stable/ussuri
This commit is contained in:
commit
d8bd7cba9c
|
@ -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.
|
||||
|
@ -631,6 +635,8 @@ resources:
|
|||
nova::compute::libvirt::libvirt_cpu_mode: NovaLibvirtCPUMode
|
||||
nova::compute::libvirt::libvirt_cpu_model: NovaLibvirtCPUModels
|
||||
nova::compute::libvirt::libvirt_cpu_model_extra_flags: NovaLibvirtCPUModelExtraFlags
|
||||
nova_compute_opt_volumes: NovaComputeOptVolumes
|
||||
nova_compute_opt_env_vars: NovaComputeOptEnvVars
|
||||
nova::workarounds::never_download_image_if_on_rbd: NovaDisableImageDownloadToRbd
|
||||
nova_permit_post_copy: NovaLiveMigrationPermitPostCopy
|
||||
nova_permit_auto_converge: NovaLiveMigrationPermitAutoConverge
|
||||
|
@ -714,6 +720,8 @@ resources:
|
|||
NovaLibvirtCPUMode: {get_param: NovaLibvirtCPUMode}
|
||||
NovaLibvirtCPUModels: {get_param: NovaLibvirtCPUModels}
|
||||
NovaLibvirtCPUModelExtraFlags: {get_param: NovaLibvirtCPUModelExtraFlags}
|
||||
NovaComputeOptVolumes: {get_param: NovaComputeOptVolumes}
|
||||
NovaComputeOptEnvVars: {get_param: NovaComputeOptEnvVars}
|
||||
NovaDisableImageDownloadToRbd: {get_param: NovaDisableImageDownloadToRbd}
|
||||
NovaLiveMigrationPermitPostCopy: {get_param: NovaLiveMigrationPermitPostCopy}
|
||||
NovaLiveMigrationPermitAutoConverge: {get_param: NovaLiveMigrationPermitAutoConverge}
|
||||
|
@ -1007,7 +1015,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
|
||||
|
@ -1031,7 +1039,7 @@ outputs:
|
|||
- []
|
||||
environment:
|
||||
map_merge:
|
||||
- {get_param: NovaComputeOptEnvVars}
|
||||
- {get_attr: [RoleParametersValue, value, nova_compute_opt_env_vars]}
|
||||
- KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||
- LIBGUESTFS_BACKEND: direct
|
||||
- if:
|
||||
|
|
Loading…
Reference in New Issue