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_deploy | |
parent | 3a20d3f0c22663a9bb6d6fc2795adc8cc1d3939b (diff) | |
parent | 11b3cb25a9884d8eaed0544a5ef2862e4a046652 (diff) |
Merge "Revert "Revert "Blacklist support for ExtraConfig"""
Diffstat (limited to 'extraconfig/pre_deploy')
-rw-r--r-- | extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml b/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml index 96632bc2..fb0d1699 100644 --- a/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml +++ b/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml @@ -59,6 +59,19 @@ parameters: description: | When enabled, the system will perform a yum update after performing the RHEL Registration process. + 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. + +conditions: + deployment_actions_empty: + equals: + - {get_param: deployment_actions} + - [] resources: @@ -136,7 +149,11 @@ resources: name: RHELUnregistrationDeployment server: {get_param: server} config: {get_resource: RHELUnregistration} - actions: ['DELETE'] # Only do this on DELETE + actions: + if: + - deployment_actions_empty + - [] + - ['DELETE'] # Only do this on DELETE input_values: REG_METHOD: {get_param: rhel_reg_method} @@ -169,7 +186,11 @@ resources: name: UpdateDeploymentAfterRHELRegistration config: {get_resource: YumUpdateConfigurationAfterRHELRegistration} server: {get_param: server} - actions: ['CREATE'] # Only do this on CREATE + actions: + if: + - deployment_actions_empty + - [] + - ['CREATE'] # Only do this on CREATE outputs: deploy_stdout: |