diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-07-13 04:08:29 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-07-13 04:08:30 +0000 |
commit | 7d07abf68281dad3edf5e23b66f0ed62f2f353d9 (patch) | |
tree | 869a658f49090eb05934a7456f8a65f58f03c106 /extraconfig/pre_network/host_config_and_reboot.role.j2.yaml | |
parent | 3a20d3f0c22663a9bb6d6fc2795adc8cc1d3939b (diff) | |
parent | 11b3cb25a9884d8eaed0544a5ef2862e4a046652 (diff) |
Merge "Revert "Revert "Blacklist support for ExtraConfig"""
Diffstat (limited to 'extraconfig/pre_network/host_config_and_reboot.role.j2.yaml')
-rw-r--r-- | extraconfig/pre_network/host_config_and_reboot.role.j2.yaml | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/extraconfig/pre_network/host_config_and_reboot.role.j2.yaml b/extraconfig/pre_network/host_config_and_reboot.role.j2.yaml index 41d8f4f6..fe52ef7e 100644 --- a/extraconfig/pre_network/host_config_and_reboot.role.j2.yaml +++ b/extraconfig/pre_network/host_config_and_reboot.role.j2.yaml @@ -19,6 +19,13 @@ parameters: {{role}}HostCpusList: type: string default: "" + deployment_actions: + default: ['CREATE', 'UPDATE'] + type: comma_delimited_list + description: > + List of stack actions that will trigger any deployments in this + templates. The actions will be an empty list of the server is in the + toplevel DeploymentServerBlacklist parameter's value. parameter_group: - label: deprecated @@ -38,6 +45,10 @@ conditions: equals: - get_param: {{role}}TunedProfileName - "" + deployment_actions_empty: + equals: + - {get_param: deployment_actions} + - [] resources: @@ -62,7 +73,11 @@ resources: name: HostParametersDeployment server: {get_param: server} config: {get_resource: HostParametersConfig} - actions: ['CREATE'] # Only do this on CREATE + actions: + if: + - deployment_actions_empty + - [] + - ['CREATE'] # Only do this on CREATE input_values: _KERNEL_ARGS_: {get_param: {{role}}KernelArgs} _TUNED_PROFILE_NAME_: {get_param: {{role}}TunedProfileName} @@ -88,7 +103,11 @@ resources: name: RebootDeployment server: {get_param: server} config: {get_resource: RebootConfig} - actions: ['CREATE'] # Only do this on CREATE + actions: + if: + - deployment_actions_empty + - [] + - ['CREATE'] # Only do this on CREATE signal_transport: NO_SIGNAL outputs: |