diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-06-19 21:22:45 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-06-19 21:22:45 +0000 |
commit | 27a92d279e623b96550310354f3b83fea82fef87 (patch) | |
tree | 8be40a6b91832f101e7657f8bd4493f756029eab /puppet/compute-role.yaml | |
parent | 11a97ec7430118bbf4a11c87eceb3adec40ea4ac (diff) | |
parent | d6c0979eb3de79b8c3a79ea5798498f0241eb32d (diff) |
Merge "Blacklist support for ExtraConfig"
Diffstat (limited to 'puppet/compute-role.yaml')
-rw-r--r-- | puppet/compute-role.yaml | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/puppet/compute-role.yaml b/puppet/compute-role.yaml index 7bcee47d..37eb98d1 100644 --- a/puppet/compute-role.yaml +++ b/puppet/compute-role.yaml @@ -386,6 +386,7 @@ resources: properties: server: {get_resource: NovaCompute} RoleParameters: {get_param: RoleParameters} + deployment_actions: {get_attr: [DeploymentActions, value]} NetworkConfig: type: OS::TripleO::Compute::Net::SoftwareConfig @@ -512,6 +513,9 @@ resources: ComputeExtraConfigPre: depends_on: NovaComputeDeployment type: OS::TripleO::ComputeExtraConfigPre + # 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: NovaCompute} @@ -520,6 +524,9 @@ resources: NodeExtraConfig: depends_on: [ComputeExtraConfigPre, NodeTLSCAData] 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: NovaCompute} @@ -542,11 +549,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: NovaComputeDeployment properties: server: {get_resource: NovaCompute} + deployment_actions: {get_attr: [DeploymentActions, value]} outputs: ip_address: |