diff options
author | 2017-07-13 04:08:29 +0000 | |
---|---|---|
committer | 2017-07-13 04:08:30 +0000 | |
commit | 7d07abf68281dad3edf5e23b66f0ed62f2f353d9 (patch) | |
tree | 869a658f49090eb05934a7456f8a65f58f03c106 /puppet/controller-role.yaml | |
parent | 3a20d3f0c22663a9bb6d6fc2795adc8cc1d3939b (diff) | |
parent | 11b3cb25a9884d8eaed0544a5ef2862e4a046652 (diff) |
Merge "Revert "Revert "Blacklist support for ExtraConfig"""
Diffstat (limited to 'puppet/controller-role.yaml')
-rw-r--r-- | puppet/controller-role.yaml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml index c9c30af5..cdc2ec68 100644 --- a/puppet/controller-role.yaml +++ b/puppet/controller-role.yaml @@ -441,6 +441,7 @@ resources: server: {get_resource: Controller} RoleParameters: {get_param: RoleParameters} ServiceNames: {get_param: ServiceNames} + deployment_actions: {get_attr: [DeploymentActions, value]} NetworkConfig: type: OS::TripleO::Controller::Net::SoftwareConfig @@ -583,6 +584,9 @@ resources: ControllerExtraConfigPre: depends_on: ControllerDeployment type: OS::TripleO::ControllerExtraConfigPre + # We have to use conditions here so that we don't break backwards + # compatibility with templates everywhere + condition: server_not_blacklisted properties: server: {get_resource: Controller} @@ -591,6 +595,9 @@ resources: NodeExtraConfig: depends_on: [ControllerExtraConfigPre, NodeTLSData] type: OS::TripleO::NodeExtraConfig + # We have to use conditions here so that we don't break backwards + # compatibility with templates everywhere + condition: server_not_blacklisted properties: server: {get_resource: Controller} @@ -613,11 +620,21 @@ resources: update_identifier: get_param: UpdateIdentifier + DeploymentActions: + type: OS::Heat::Value + properties: + value: + if: + - server_not_blacklisted + - ['CREATE', 'UPDATE'] + - [] + SshHostPubKey: type: OS::TripleO::Ssh::HostPubKey depends_on: ControllerDeployment properties: server: {get_resource: Controller} + deployment_actions: {get_attr: [DeploymentActions, value]} outputs: ip_address: |