Browse Source

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.

Conflicts:
      deployment/nova/nova-compute-container-puppet.yaml

Change-Id: Ie91633c2bcc8011cc62b46452ea5b444cf12029f
(cherry picked from commit 1471976c6e)
changes/95/774395/1
Alex Schultz 10 months ago
committed by Rajesh Tailor
parent
commit
d38c3df912
  1. 12
      deployment/nova/nova-compute-container-puppet.yaml

12
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.
@ -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…
Cancel
Save