diff options
| author |   Alex Schultz <aschultz@redhat.com> | 2017-06-22 13:35:19 +0000 |
|---|---|---|
| committer | Alex Schultz <aschultz@redhat.com> | 2017-06-22 13:35:19 +0000 |
| commit | 69936229f4def703cd44ab164d8d1989c9fa37cb (patch) | |
| tree | 856ea52fb2c8de1ba0aa4bc625d706a989304815 /extraconfig/pre_network/config_then_reboot.yaml | |
| parent | d6c0979eb3de79b8c3a79ea5798498f0241eb32d (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_network/config_then_reboot.yaml')
| -rw-r--r-- | extraconfig/pre_network/config_then_reboot.yaml | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/extraconfig/pre_network/config_then_reboot.yaml b/extraconfig/pre_network/config_then_reboot.yaml index 79cb7cbc..48ba5263 100644 --- a/extraconfig/pre_network/config_then_reboot.yaml +++ b/extraconfig/pre_network/config_then_reboot.yaml @@ -7,19 +7,6 @@ description: > parameters: server: type: string - 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: @@ -37,11 +24,6 @@ resources: name: SomeDeployment server: {get_param: server} config: {get_resource: SomeConfig} - actions: - if: - - deployment_actions_empty - - [] - - ['CREATE'] # Only do this on CREATE actions: ['CREATE'] # Only do this on CREATE RebootConfig: @@ -62,9 +44,5 @@ resources: name: RebootDeployment server: {get_param: server} config: {get_resource: RebootConfig} - actions: - if: - - deployment_actions_empty - - [] - - ['CREATE'] # Only do this on CREATE + actions: ['CREATE'] # Only do this on CREATE signal_transport: NO_SIGNAL |