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/controller-role.yaml | |
| parent | 2a0261768a215aec590415b0ff4f2fffa24ee840 (diff) | |
| parent | d48299cb505e8b051689207e031eb67df11237ab (diff) | |
Merge "Use Deployment actions for blacklist"
Diffstat (limited to 'puppet/controller-role.yaml')
| -rw-r--r-- | puppet/controller-role.yaml | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml index 4c0a70f6..cccfdef1 100644 --- a/puppet/controller-role.yaml +++ b/puppet/controller-role.yaml @@ -415,13 +415,16 @@ resources: NetworkDeployment: type: OS::TripleO::SoftwareDeployment - condition: server_not_blacklisted depends_on: PreNetworkConfig properties: name: NetworkDeployment config: {get_resource: NetworkConfig} server: {get_resource: Controller} - actions: {get_param: NetworkDeploymentActions} + actions: + if: + - server_not_blacklisted + - {get_param: NetworkDeploymentActions} + - [] input_values: bridge_name: br-ex interface_name: {get_param: NeutronPublicInterface} @@ -457,19 +460,27 @@ resources: # but https://bugs.launchpad.net/heat/+bug/1649900 needs fixing first ControllerUpgradeInitDeployment: type: OS::Heat::SoftwareDeployment - condition: server_not_blacklisted depends_on: NetworkDeployment properties: name: ControllerUpgradeInitDeployment + actions: + if: + - server_not_blacklisted + - ['CREATE', 'UPDATE'] + - [] server: {get_resource: Controller} config: {get_resource: ControllerUpgradeInitConfig} ControllerDeployment: type: OS::TripleO::SoftwareDeployment - condition: server_not_blacklisted depends_on: ControllerUpgradeInitDeployment properties: name: ControllerDeployment + actions: + if: + - server_not_blacklisted + - ['CREATE', 'UPDATE'] + - [] config: {get_resource: ControllerConfig} server: {get_resource: Controller} input_values: @@ -551,10 +562,14 @@ resources: UpdateDeployment: type: OS::Heat::SoftwareDeployment - condition: server_not_blacklisted depends_on: NetworkDeployment properties: name: UpdateDeployment + actions: + if: + - server_not_blacklisted + - ['CREATE', 'UPDATE'] + - [] config: {get_resource: UpdateConfig} server: {get_resource: Controller} input_values: |