summaryrefslogtreecommitdiffstats
path: root/extraconfig/pre_deploy
diff options
context:
space:
mode:
authorAlex Schultz <aschultz@redhat.com>2017-06-22 13:35:19 +0000
committerAlex Schultz <aschultz@redhat.com>2017-06-22 13:35:19 +0000
commit69936229f4def703cd44ab164d8d1989c9fa37cb (patch)
tree856ea52fb2c8de1ba0aa4bc625d706a989304815 /extraconfig/pre_deploy
parentd6c0979eb3de79b8c3a79ea5798498f0241eb32d (diff)
Revert "Blacklist support for ExtraConfig"
This reverts commit d6c0979eb3de79b8c3a79ea5798498f0241eb32d. This seems to be causing issues in Heat in upgrades. Change-Id: I379fb2133358ba9c3c989c98a2dd399ad064f706 Related-Bug: #1699463
Diffstat (limited to 'extraconfig/pre_deploy')
-rw-r--r--extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml25
1 files changed, 2 insertions, 23 deletions
diff --git a/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml b/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
index fb0d1699..96632bc2 100644
--- a/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
+++ b/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
@@ -59,19 +59,6 @@ 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:
@@ -149,11 +136,7 @@ resources:
name: RHELUnregistrationDeployment
server: {get_param: server}
config: {get_resource: RHELUnregistration}
- actions:
- if:
- - deployment_actions_empty
- - []
- - ['DELETE'] # Only do this on DELETE
+ actions: ['DELETE'] # Only do this on DELETE
input_values:
REG_METHOD: {get_param: rhel_reg_method}
@@ -186,11 +169,7 @@ resources:
name: UpdateDeploymentAfterRHELRegistration
config: {get_resource: YumUpdateConfigurationAfterRHELRegistration}
server: {get_param: server}
- actions:
- if:
- - deployment_actions_empty
- - []
- - ['CREATE'] # Only do this on CREATE
+ actions: ['CREATE'] # Only do this on CREATE
outputs:
deploy_stdout: