Merge "Convert service_name to underscore syntax"

diff --cc puppet/services/ceilometer-api.yaml
Simple merge

diff --cc puppet/services/ceilometer-base.yaml
Simple merge

diff --cc puppet/services/cinder-api.yaml
Simple merge

diff --cc puppet/services/cinder-base.yaml
Simple merge

diff --cc puppet/services/cinder-scheduler.yaml
index d509118,28dc694..e03090a
--- 1/puppet/services/cinder-scheduler.yaml
--- 2/puppet/services/cinder-scheduler.yaml
+++ b/puppet/services/cinder-scheduler.yaml
@@@ -21,10 -21,8 +21,10 @@@ outputs
    role_data:
      description: Role data for the Cinder Scheduler role.
      value:
-       service_name: cinder-scheduler
+       service_name: cinder_scheduler
        config_settings:
 -        get_attr: [CinderBase, role_data, config_settings]
 +        map_merge:
 +          - get_attr: [CinderBase, role_data, config_settings]
 +          - cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
        step_config: |
          include ::tripleo::profile::base::cinder::scheduler

diff --cc puppet/services/database/mongodb-base.yaml
index ec87e21,88d4570..b876132
--- 1/puppet/services/database/mongodb-base.yaml
--- 2/puppet/services/database/mongodb-base.yaml
+++ b/puppet/services/database/mongodb-base.yaml
@@@ -24,9 -24,8 +24,9 @@@ outputs
    role_data:
      description: Role data for the MongoDB base service.
      value:
-       service_name: mongodb-base
+       service_name: mongodb_base
        config_settings:
          mongodb::server::nojournal: {get_param: MongoDbNoJournal}
 +        mongodb::server::journal: false
          mongodb::server::ipv6: {get_param: MongoDbIPv6}
 -        mongodb::server::replset: {get_param: MongoDbReplset}
 +        mongodb::server::replset: {get_param: MongoDbReplset}

diff --cc puppet/services/database/redis-base.yaml
index 24175d5,2fa624f..fe8c065
--- 1/puppet/services/database/redis-base.yaml
--- 2/puppet/services/database/redis-base.yaml
+++ b/puppet/services/database/redis-base.yaml
@@@ -13,13 -13,10 +13,13 @@@ outputs
    role_data:
      description: Role data for the redis role.
      value:
-       service_name: redis-base
+       service_name: redis_base
        config_settings:
 -       redis::requirepass: {get_param: RedisPassword}
 -       redis::masterauth: {get_param: RedisPassword}
 -       redis::sentinel_auth_pass: {get_param: RedisPassword}
 -       tripleo::loadbalancer::redis_password: {get_param: RedisPassword}
 -
 +        redis::requirepass: {get_param: RedisPassword}
 +        redis::masterauth: {get_param: RedisPassword}
 +        redis::sentinel_auth_pass: {get_param: RedisPassword}
 +        redis::port: 6379
 +        redis::sentinel::master_name: '"%{hiera(\"bootstrap_nodeid\")}"'
 +        redis::sentinel::redis_host: '"%{hiera(\"bootstrap_nodeid_ip\")}"'
 +        redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh'
 +        tripleo::loadbalancer::redis_password: {get_param: RedisPassword}

diff --cc puppet/services/glance-api.yaml
Simple merge

diff --cc puppet/services/glance-registry.yaml
Simple merge

diff --cc puppet/services/gnocchi-api.yaml
Simple merge

diff --cc puppet/services/gnocchi-base.yaml
Simple merge

diff --cc puppet/services/heat-base.yaml
Simple merge

diff --cc puppet/services/heat-engine.yaml
Simple merge

diff --cc puppet/services/neutron-base.yaml
Simple merge

diff --cc puppet/services/neutron-l3.yaml
Simple merge

diff --cc puppet/services/neutron-metadata.yaml
Simple merge

diff --cc puppet/services/neutron-server.yaml
Simple merge

diff --cc puppet/services/nova-api.yaml
Simple merge

diff --cc puppet/services/nova-base.yaml
Simple merge

diff --cc puppet/services/nova-compute.yaml
Simple merge

diff --cc puppet/services/nova-vncproxy.yaml
index 3e2a3d8,f681210..0b9cef3
--- 1/puppet/services/nova-vncproxy.yaml
--- 2/puppet/services/nova-vncproxy.yaml
+++ b/puppet/services/nova-vncproxy.yaml
@@@ -20,10 -20,8 +20,10 @@@ outputs
    role_data:
      description: Role data for the Nova Vncproxy service.
      value:
-       service_name: nova-vncproxy
+       service_name: nova_vncproxy
        config_settings:
 -        get_attr: [NovaBase, role_data, config_settings]
 +        map_merge:
 +          - get_attr: [NovaBase, role_data, config_settings]
 +          - nova::vncproxy::enabled: true
        step_config: |
          include tripleo::profile::base::nova::vncproxy

diff --cc puppet/services/pacemaker/glance-api.yaml
Simple merge

diff --cc puppet/services/sahara-base.yaml
Simple merge

diff --cc puppet/services/sahara-engine.yaml
Simple merge

diff --cc puppet/services/swift-proxy.yaml
Simple merge

diff --cc puppet/services/swift-storage.yaml
Simple merge