diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-13 14:21:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-13 14:21:06 +0000 |
| commit | 2485366158bb8f439500d78c8f341c0a25db0fce (patch) | |
| tree | ef98b3c4161909ebdaae7079f5f0167811f75282 /puppet/services/nova-conductor.yaml | |
| parent | 6d72ac41c0a71a38c0f7d1b6decaac65c1d62ae2 (diff) | |
| parent | 38f98383d396d89b8f6047e57e5e606615ee5a16 (diff) | |
Merge "Only set NovaWorkers in the non-default case"
Diffstat (limited to 'puppet/services/nova-conductor.yaml')
| -rw-r--r-- | puppet/services/nova-conductor.yaml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/puppet/services/nova-conductor.yaml b/puppet/services/nova-conductor.yaml index 2671cdd3..a10d9560 100644 --- a/puppet/services/nova-conductor.yaml +++ b/puppet/services/nova-conductor.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2016-04-08 +heat_template_version: 2016-10-14 description: > OpenStack Nova Conductor service configured with Puppet @@ -31,6 +31,9 @@ parameters: tag: openstack.nova.scheduler path: /var/log/nova/nova-scheduler.log +conditions: + nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]} + resources: NovaBase: type: ./nova-base.yaml @@ -50,7 +53,11 @@ outputs: - nova config_settings: map_merge: - - get_attr: [NovaBase, role_data, config_settings] + - get_attr: [NovaBase, role_data, config_settings] + - + if: + - nova_workers_zero + - {} - nova::conductor::workers: {get_param: NovaWorkers} step_config: | include tripleo::profile::base::nova::conductor |