diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-06-08 19:53:26 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-06-08 19:53:26 +0000 |
commit | d21ef0d91c66f68a2cf65bb0c05efa54e433a290 (patch) | |
tree | 51cadbd18b19977575dd2025add7e16ca12ce0de /puppet/compute-role.yaml | |
parent | 2a0261768a215aec590415b0ff4f2fffa24ee840 (diff) | |
parent | d48299cb505e8b051689207e031eb67df11237ab (diff) |
Merge "Use Deployment actions for blacklist"
Diffstat (limited to 'puppet/compute-role.yaml')
-rw-r--r-- | puppet/compute-role.yaml | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/puppet/compute-role.yaml b/puppet/compute-role.yaml index e453508a..06a31ec9 100644 --- a/puppet/compute-role.yaml +++ b/puppet/compute-role.yaml @@ -396,12 +396,15 @@ resources: NetworkDeployment: type: OS::TripleO::SoftwareDeployment depends_on: PreNetworkConfig - condition: server_not_blacklisted properties: name: NetworkDeployment + actions: + if: + - server_not_blacklisted + - {get_param: NetworkDeploymentActions} + - [] config: {get_resource: NetworkConfig} server: {get_resource: NovaCompute} - actions: {get_param: NetworkDeploymentActions} input_values: bridge_name: {get_param: NeutronPhysicalBridge} interface_name: {get_param: NeutronPublicInterface} @@ -423,9 +426,13 @@ resources: NovaComputeUpgradeInitDeployment: type: OS::Heat::SoftwareDeployment depends_on: NetworkDeployment - condition: server_not_blacklisted properties: name: NovaComputeUpgradeInitDeployment + actions: + if: + - server_not_blacklisted + - ['CREATE', 'UPDATE'] + - [] server: {get_resource: NovaCompute} config: {get_resource: NovaComputeUpgradeInitConfig} @@ -476,9 +483,13 @@ resources: NovaComputeDeployment: type: OS::TripleO::SoftwareDeployment depends_on: NovaComputeUpgradeInitDeployment - condition: server_not_blacklisted properties: name: NovaComputeDeployment + actions: + if: + - server_not_blacklisted + - ['CREATE', 'UPDATE'] + - [] config: {get_resource: NovaComputeConfig} server: {get_resource: NovaCompute} input_values: @@ -512,9 +523,13 @@ resources: UpdateDeployment: type: OS::Heat::SoftwareDeployment depends_on: NetworkDeployment - condition: server_not_blacklisted properties: name: UpdateDeployment + actions: + if: + - server_not_blacklisted + - ['CREATE', 'UPDATE'] + - [] config: {get_resource: UpdateConfig} server: {get_resource: NovaCompute} input_values: |