summaryrefslogtreecommitdiffstats
path: root/puppet/services/pacemaker/nova-conductor.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-29 08:52:05 +0000
committerGerrit Code Review <review@openstack.org>2016-07-29 08:52:05 +0000
commit9aec3de5b842967cfa104ec5aebd359b71379c64 (patch)
tree44533abb637c92fa172377533e4fb3c1520cd73b /puppet/services/pacemaker/nova-conductor.yaml
parent1eeb7a806999a85a20dfc86dd465135a885da397 (diff)
parent7df649f59e3cb3d0b811b526b4fdb000337e01de (diff)
Merge "Convert service_name to underscore syntax"
Diffstat (limited to 'puppet/services/pacemaker/nova-conductor.yaml')
-rw-r--r--puppet/services/pacemaker/nova-conductor.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/services/pacemaker/nova-conductor.yaml b/puppet/services/pacemaker/nova-conductor.yaml
index fe0b00f3..1f57cf08 100644
--- a/puppet/services/pacemaker/nova-conductor.yaml
+++ b/puppet/services/pacemaker/nova-conductor.yaml
@@ -21,7 +21,7 @@ outputs:
role_data:
description: Role data for the Nova Conductor role.
value:
- service_name: nova-conductor
+ service_name: nova_conductor
config_settings:
map_merge:
- get_attr: [NovaConductorBase, role_data, config_settings]