diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-06-22 21:22:02 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-06-22 21:22:02 +0000 |
commit | 7b60e56c0eb90e2a710cc5be7527e58d254621be (patch) | |
tree | a9de13e6357d32351b8f04b6c76d4315e499c92b /puppet/controller-role.yaml | |
parent | 57c6d270a4fa4fe5632cf0bda85121a0719ba5e8 (diff) | |
parent | 69936229f4def703cd44ab164d8d1989c9fa37cb (diff) |
Merge "Revert "Blacklist support for ExtraConfig""
Diffstat (limited to 'puppet/controller-role.yaml')
-rw-r--r-- | puppet/controller-role.yaml | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml index 01f54df0..6a032656 100644 --- a/puppet/controller-role.yaml +++ b/puppet/controller-role.yaml @@ -406,7 +406,6 @@ resources: properties: server: {get_resource: Controller} RoleParameters: {get_param: RoleParameters} - deployment_actions: {get_attr: [DeploymentActions, value]} NetworkConfig: type: OS::TripleO::Controller::Net::SoftwareConfig @@ -553,9 +552,6 @@ 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} @@ -564,9 +560,6 @@ 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} @@ -589,21 +582,11 @@ 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: |