Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Configure /etc/hosts via os-collect-config script"
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
nova-conductor.yaml
diff --git
a/puppet/services/nova-conductor.yaml
b/puppet/services/nova-conductor.yaml
index
2671cdd
..
a10d956
100644
(file)
--- 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
description: >
OpenStack Nova Conductor service configured with Puppet
@@
-31,6
+31,9
@@
parameters:
tag: openstack.nova.scheduler
path: /var/log/nova/nova-scheduler.log
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
resources:
NovaBase:
type: ./nova-base.yaml
@@
-50,7
+53,11
@@
outputs:
- nova
config_settings:
map_merge:
- 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
- nova::conductor::workers: {get_param: NovaWorkers}
step_config: |
include tripleo::profile::base::nova::conductor