diff options
95 files changed, 96 insertions, 95 deletions
diff --git a/puppet/services/ceilometer-agent-central.yaml b/puppet/services/ceilometer-agent-central.yaml index 34735f75..80f656d0 100644 --- a/puppet/services/ceilometer-agent-central.yaml +++ b/puppet/services/ceilometer-agent-central.yaml @@ -28,7 +28,7 @@ outputs: role_data: description: Role data for the Ceilometer Central Agent role. value: - service_name: ceilometer-agent-central + service_name: ceilometer_agent_central config_settings: map_merge: - get_attr: [CeilometerServiceBase, role_data, config_settings] diff --git a/puppet/services/ceilometer-agent-compute.yaml b/puppet/services/ceilometer-agent-compute.yaml index 9e4d0575..181c64d2 100644 --- a/puppet/services/ceilometer-agent-compute.yaml +++ b/puppet/services/ceilometer-agent-compute.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Ceilometer Compute Agent role. value: - service_name: ceilometer-agent-compute + service_name: ceilometer_agent_compute config_settings: get_attr: [CeilometerServiceBase, role_data, config_settings] step_config: | diff --git a/puppet/services/ceilometer-agent-notification.yaml b/puppet/services/ceilometer-agent-notification.yaml index b65e189b..58e28a3d 100644 --- a/puppet/services/ceilometer-agent-notification.yaml +++ b/puppet/services/ceilometer-agent-notification.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Ceilometer Notification Agent role. value: - service_name: ceilometer-agent-notification + service_name: ceilometer_agent_notification config_settings: get_attr: [CeilometerServiceBase, role_data, config_settings] step_config: | diff --git a/puppet/services/ceilometer-api.yaml b/puppet/services/ceilometer-api.yaml index d0f3767d..b4db4fe9 100644 --- a/puppet/services/ceilometer-api.yaml +++ b/puppet/services/ceilometer-api.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Ceilometer API role. value: - service_name: ceilometer-api + service_name: ceilometer_api config_settings: map_merge: - get_attr: [CeilometerServiceBase, role_data, config_settings] diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml index 40060a11..aa0c76c9 100644 --- a/puppet/services/ceilometer-base.yaml +++ b/puppet/services/ceilometer-base.yaml @@ -62,7 +62,7 @@ outputs: role_data: description: Role data for the Ceilometer role. value: - service_name: ceilometer-base + service_name: ceilometer_base config_settings: ceilometer::db::database_connection: list_join: diff --git a/puppet/services/ceilometer-collector.yaml b/puppet/services/ceilometer-collector.yaml index 540a4654..7a7bc19d 100644 --- a/puppet/services/ceilometer-collector.yaml +++ b/puppet/services/ceilometer-collector.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Ceilometer Collector role. value: - service_name: ceilometer-collector + service_name: ceilometer_collector config_settings: get_attr: [CeilometerServiceBase, role_data, config_settings] step_config: | diff --git a/puppet/services/ceilometer-expirer.yaml b/puppet/services/ceilometer-expirer.yaml index 7816a859..c960e6dc 100644 --- a/puppet/services/ceilometer-expirer.yaml +++ b/puppet/services/ceilometer-expirer.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Ceilometer Expirer role. value: - service_name: ceilometer-expirer + service_name: ceilometer_expirer config_settings: get_attr: [CeilometerServiceBase, role_data, config_settings] step_config: | diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml index 76f649b0..563feebe 100644 --- a/puppet/services/ceph-base.yaml +++ b/puppet/services/ceph-base.yaml @@ -57,7 +57,7 @@ outputs: role_data: description: Role data for the Ceph base service. value: - service_name: ceph-base + service_name: ceph_base config_settings: tripleo::profile::base::ceph::ceph_ipv6: {get_param: CephIPv6} tripleo::profile::base::ceph::enable_ceph_storage: {get_param: ControllerEnableCephStorage} diff --git a/puppet/services/ceph-client.yaml b/puppet/services/ceph-client.yaml index fc23f719..33bbbe58 100644 --- a/puppet/services/ceph-client.yaml +++ b/puppet/services/ceph-client.yaml @@ -18,7 +18,7 @@ outputs: role_data: description: Role data for the Cinder OSD service. value: - service_name: ceph-client + service_name: ceph_client config_settings: get_attr: [CephBase, role_data, config_settings] step_config: | diff --git a/puppet/services/ceph-external.yaml b/puppet/services/ceph-external.yaml index b656e245..7c1cfbae 100644 --- a/puppet/services/ceph-external.yaml +++ b/puppet/services/ceph-external.yaml @@ -40,7 +40,7 @@ outputs: role_data: description: Role data for the Ceph External service. value: - service_name: ceph-external + service_name: ceph_external config_settings: tripleo::profile::base::ceph::ceph_mon_host: {get_param: CephExternalMonHost} ceph::profile::params::fsid: {get_param: CephClusterFSID} diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml index 8df7683d..25da71f0 100644 --- a/puppet/services/ceph-mon.yaml +++ b/puppet/services/ceph-mon.yaml @@ -41,7 +41,7 @@ outputs: role_data: description: Role data for the Ceph Monitor service. value: - service_name: ceph-mon + service_name: ceph_mon config_settings: map_merge: - get_attr: [CephBase, role_data, config_settings] diff --git a/puppet/services/ceph-osd.yaml b/puppet/services/ceph-osd.yaml index b6f464bb..21cefb34 100644 --- a/puppet/services/ceph-osd.yaml +++ b/puppet/services/ceph-osd.yaml @@ -18,7 +18,7 @@ outputs: role_data: description: Role data for the Cinder OSD service. value: - service_name: ceph-osd + service_name: ceph_osd config_settings: map_merge: - get_attr: [CephBase, role_data, config_settings] diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml index 0cefb380..ba2131c2 100644 --- a/puppet/services/cinder-api.yaml +++ b/puppet/services/cinder-api.yaml @@ -30,7 +30,7 @@ outputs: role_data: description: Role data for the Cinder API role. value: - service_name: cinder-api + service_name: cinder_api config_settings: map_merge: - get_attr: [CinderBase, role_data, config_settings] diff --git a/puppet/services/cinder-base.yaml b/puppet/services/cinder-base.yaml index adacc737..e3658543 100644 --- a/puppet/services/cinder-base.yaml +++ b/puppet/services/cinder-base.yaml @@ -40,7 +40,7 @@ outputs: role_data: description: Role data for the Cinder base service. value: - service_name: cinder-base + service_name: cinder_base config_settings: cinder::database_connection: list_join: diff --git a/puppet/services/cinder-scheduler.yaml b/puppet/services/cinder-scheduler.yaml index 2e1e852d..28dc6945 100644 --- a/puppet/services/cinder-scheduler.yaml +++ b/puppet/services/cinder-scheduler.yaml @@ -21,7 +21,7 @@ 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] step_config: | diff --git a/puppet/services/cinder-volume.yaml b/puppet/services/cinder-volume.yaml index 8f63ff6a..9f49bc06 100644 --- a/puppet/services/cinder-volume.yaml +++ b/puppet/services/cinder-volume.yaml @@ -59,7 +59,7 @@ outputs: role_data: description: Role data for the Cinder Volume role. value: - service_name: cinder-volume + service_name: cinder_volume config_settings: map_merge: - get_attr: [CinderBase, role_data, config_settings] diff --git a/puppet/services/database/mongodb-base.yaml b/puppet/services/database/mongodb-base.yaml index ed0b92af..88d45706 100644 --- a/puppet/services/database/mongodb-base.yaml +++ b/puppet/services/database/mongodb-base.yaml @@ -24,7 +24,7 @@ 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::ipv6: {get_param: MongoDbIPv6} diff --git a/puppet/services/database/redis-base.yaml b/puppet/services/database/redis-base.yaml index c7b083fa..2fa624f8 100644 --- a/puppet/services/database/redis-base.yaml +++ b/puppet/services/database/redis-base.yaml @@ -13,7 +13,7 @@ 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} diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml index ee4c17c7..5df12209 100644 --- a/puppet/services/glance-api.yaml +++ b/puppet/services/glance-api.yaml @@ -65,7 +65,7 @@ outputs: role_data: description: Role data for the Glance API role. value: - service_name: glance-api + service_name: glance_api config_settings: glance::api::database_connection: list_join: diff --git a/puppet/services/glance-registry.yaml b/puppet/services/glance-registry.yaml index f9d9dd6b..d2a6f4fa 100644 --- a/puppet/services/glance-registry.yaml +++ b/puppet/services/glance-registry.yaml @@ -26,7 +26,7 @@ outputs: role_data: description: Role data for the Glance Registry role. value: - service_name: glance-registry + service_name: glance_registry config_settings: glance::registry::database_connection: list_join: diff --git a/puppet/services/gnocchi-api.yaml b/puppet/services/gnocchi-api.yaml index bf23cda1..891a60ec 100644 --- a/puppet/services/gnocchi-api.yaml +++ b/puppet/services/gnocchi-api.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Gnocchi role. value: - service_name: gnocchi-api + service_name: gnocchi_api config_settings: map_merge: - get_attr: [GnocchiServiceBase, role_data, config_settings] diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml index fa00f736..cb1aad89 100644 --- a/puppet/services/gnocchi-base.yaml +++ b/puppet/services/gnocchi-base.yaml @@ -39,7 +39,7 @@ outputs: role_data: description: Shared role data for the Heat services. value: - service_name: gnocchi-base + service_name: gnocchi_base config_settings: #Gnocchi engine gnocchi::debug: {get_input: debug} diff --git a/puppet/services/gnocchi-metricd.yaml b/puppet/services/gnocchi-metricd.yaml index 20215380..8041c6f4 100644 --- a/puppet/services/gnocchi-metricd.yaml +++ b/puppet/services/gnocchi-metricd.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Gnocchi role. value: - service_name: gnocchi-metricd + service_name: gnocchi_metricd config_settings: map_merge: - get_attr: [GnocchiServiceBase, role_data, config_settings] diff --git a/puppet/services/gnocchi-statsd.yaml b/puppet/services/gnocchi-statsd.yaml index 4fef7af6..9c8e6897 100644 --- a/puppet/services/gnocchi-statsd.yaml +++ b/puppet/services/gnocchi-statsd.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Gnocchi role. value: - service_name: gnocchi-statsd + service_name: gnocchi_statsd config_settings: map_merge: - get_attr: [GnocchiServiceBase, role_data, config_settings] diff --git a/puppet/services/heat-api-cfn.yaml b/puppet/services/heat-api-cfn.yaml index 67c89bb9..f8832dd8 100644 --- a/puppet/services/heat-api-cfn.yaml +++ b/puppet/services/heat-api-cfn.yaml @@ -30,7 +30,7 @@ outputs: role_data: description: Role data for the Heat CloudFormation API role. value: - service_name: heat-api-cfn + service_name: heat_api_cfn config_settings: map_merge: - get_attr: [HeatBase, role_data, config_settings] diff --git a/puppet/services/heat-api-cloudwatch.yaml b/puppet/services/heat-api-cloudwatch.yaml index 32a0a58d..b4669ac3 100644 --- a/puppet/services/heat-api-cloudwatch.yaml +++ b/puppet/services/heat-api-cloudwatch.yaml @@ -22,7 +22,7 @@ outputs: role_data: description: Role data for the Heat Cloudwatch API role. value: - service_name: heat-api-cloudwatch + service_name: heat_api_cloudwatch config_settings: map_merge: - get_attr: [HeatBase, role_data, config_settings] diff --git a/puppet/services/heat-api.yaml b/puppet/services/heat-api.yaml index 0bb208d1..c0e7a690 100644 --- a/puppet/services/heat-api.yaml +++ b/puppet/services/heat-api.yaml @@ -30,7 +30,7 @@ outputs: role_data: description: Role data for the Heat API role. value: - service_name: heat-api + service_name: heat_api config_settings: map_merge: - get_attr: [HeatBase, role_data, config_settings] diff --git a/puppet/services/heat-base.yaml b/puppet/services/heat-base.yaml index 2a7aeabc..11818cb1 100644 --- a/puppet/services/heat-base.yaml +++ b/puppet/services/heat-base.yaml @@ -31,7 +31,7 @@ outputs: role_data: description: Shared role data for the Heat services. value: - service_name: heat-base + service_name: heat_base config_settings: heat::rabbit_userid: {get_param: RabbitUserName} heat::rabbit_password: {get_param: RabbitPassword} diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml index 2fd01885..dea1eeae 100644 --- a/puppet/services/heat-engine.yaml +++ b/puppet/services/heat-engine.yaml @@ -35,7 +35,7 @@ outputs: role_data: description: Role data for the Heat Engine role. value: - service_name: heat-engine + service_name: heat_engine config_settings: map_merge: - get_attr: [HeatBase, role_data, config_settings] diff --git a/puppet/services/ironic-api.yaml b/puppet/services/ironic-api.yaml index 6f369f74..949cdf31 100644 --- a/puppet/services/ironic-api.yaml +++ b/puppet/services/ironic-api.yaml @@ -24,7 +24,7 @@ outputs: role_data: description: Role data for the Ironic API role. value: - service_name: ironic-api + service_name: ironic_api config_settings: map_merge: - get_attr: [IronicBase, role_data, config_settings] diff --git a/puppet/services/ironic-base.yaml b/puppet/services/ironic-base.yaml index fb9d4dde..41d2234a 100644 --- a/puppet/services/ironic-base.yaml +++ b/puppet/services/ironic-base.yaml @@ -40,7 +40,7 @@ outputs: role_data: description: Role data for the Ironic role. value: - service_name: ironic-base + service_name: ironic_base config_settings: ironic::database_connection: list_join: diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml index 574e5aef..a3bce305 100644 --- a/puppet/services/ironic-conductor.yaml +++ b/puppet/services/ironic-conductor.yaml @@ -24,7 +24,7 @@ outputs: role_data: description: Role data for the Ironic conductor role. value: - service_name: ironic-conductor + service_name: ironic_conductor config_settings: map_merge: - get_attr: [IronicBase, role_data, config_settings] diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml index 301759c7..81da08f8 100644 --- a/puppet/services/neutron-base.yaml +++ b/puppet/services/neutron-base.yaml @@ -47,7 +47,7 @@ outputs: role_data: description: Role data for the Neutron base service. value: - service_name: neutron-base + service_name: neutron_base config_settings: neutron::rabbit_password: {get_param: RabbitPassword} neutron::rabbit_user: {get_param: RabbitUserName} diff --git a/puppet/services/neutron-compute-plugin-midonet.yaml b/puppet/services/neutron-compute-plugin-midonet.yaml index f08afd15..200aaa1b 100644 --- a/puppet/services/neutron-compute-plugin-midonet.yaml +++ b/puppet/services/neutron-compute-plugin-midonet.yaml @@ -14,7 +14,7 @@ outputs: role_data: description: Role data for the Neutron Compute Plumgrid plugin value: - service_name: neutron-compute-plugin-midonet + service_name: neutron_compute_plugin_midonet config_settings: step_config: | include ::tripleo::profile::base::neutron::agents::midonet diff --git a/puppet/services/neutron-compute-plugin-nuage.yaml b/puppet/services/neutron-compute-plugin-nuage.yaml index f6e2f3a8..44aac571 100644 --- a/puppet/services/neutron-compute-plugin-nuage.yaml +++ b/puppet/services/neutron-compute-plugin-nuage.yaml @@ -18,7 +18,7 @@ outputs: role_data: description: Role data for the Neutron Compute Nuage plugin value: - service_name: neutron-compute-plugin-nuage + service_name: neutron_compute_plugin_nuage config_settings: tripleo::profile::base::neutron::agents::nuage::nova_os_tenant_name: 'service' tripleo::profile::base::neutron::agents::nuage::nova_os_password: {get_param: NovaPassword} diff --git a/puppet/services/neutron-compute-plugin-opencontrail.yaml b/puppet/services/neutron-compute-plugin-opencontrail.yaml index b95a6554..fb6d640c 100644 --- a/puppet/services/neutron-compute-plugin-opencontrail.yaml +++ b/puppet/services/neutron-compute-plugin-opencontrail.yaml @@ -14,7 +14,7 @@ outputs: role_data: description: Role data for the Neutron Compute OpenContrail plugin value: - service_name: neutron-compute-plugin-opencontrail + service_name: neutron_compute_plugin_opencontrail config_settings: step_config: | include ::tripleo::profile::base::neutron::opencontrail::vrouter diff --git a/puppet/services/neutron-compute-plugin-plumgrid.yaml b/puppet/services/neutron-compute-plugin-plumgrid.yaml index 064ac9e0..ad1e3465 100644 --- a/puppet/services/neutron-compute-plugin-plumgrid.yaml +++ b/puppet/services/neutron-compute-plugin-plumgrid.yaml @@ -14,7 +14,7 @@ outputs: role_data: description: Role data for the Neutron Compute Plumgrid plugin value: - service_name: neutron-compute-plugin-plumgrid + service_name: neutron_compute_plugin_plumgrid config_settings: step_config: | include tripleo::profile::base::neutron::plumgrid diff --git a/puppet/services/neutron-dhcp.yaml b/puppet/services/neutron-dhcp.yaml index 1c57aa45..322e018d 100644 --- a/puppet/services/neutron-dhcp.yaml +++ b/puppet/services/neutron-dhcp.yaml @@ -23,7 +23,7 @@ outputs: role_data: description: Role data for the Neutron DHCP agent service. value: - service_name: neutron-dhcp + service_name: neutron_dhcp config_settings: map_merge: - get_attr: [NeutronBase, role_data, config_settings] diff --git a/puppet/services/neutron-l3.yaml b/puppet/services/neutron-l3.yaml index 0e568614..f62d2022 100644 --- a/puppet/services/neutron-l3.yaml +++ b/puppet/services/neutron-l3.yaml @@ -26,7 +26,7 @@ outputs: role_data: description: Role data for the Neutron L3 agent service. value: - service_name: neutron-l3 + service_name: neutron_l3 config_settings: map_merge: - get_attr: [NeutronBase, role_data, config_settings] diff --git a/puppet/services/neutron-metadata.yaml b/puppet/services/neutron-metadata.yaml index 04c80e01..68ccea67 100644 --- a/puppet/services/neutron-metadata.yaml +++ b/puppet/services/neutron-metadata.yaml @@ -31,7 +31,7 @@ outputs: role_data: description: Role data for the Neutron Metadata agent service. value: - service_name: neutron-metadata + service_name: neutron_metadata config_settings: map_merge: - get_attr: [NeutronBase, role_data, config_settings] diff --git a/puppet/services/neutron-midonet.yaml b/puppet/services/neutron-midonet.yaml index d48d97f0..ccc0b0dd 100644 --- a/puppet/services/neutron-midonet.yaml +++ b/puppet/services/neutron-midonet.yaml @@ -36,7 +36,7 @@ outputs: role_data: description: Role data for the Neutron Midonet plugin and services value: - service_name: neutron-midonet + service_name: neutron_midonet config_settings: tripleo::profile::base::neutron::midonet::admin_password: {get_param: AdminPassword} tripleo::profile::base::neutron::midonet::keystone_admin_token: {get_param: AdminToken} diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml index 30caeec3..d8679f2e 100644 --- a/puppet/services/neutron-ovs-agent.yaml +++ b/puppet/services/neutron-ovs-agent.yaml @@ -47,7 +47,7 @@ outputs: role_data: description: Role data for the Neutron OVS agent service. value: - service_name: neutron-ovs-agent + service_name: neutron_ovs_agent config_settings: map_merge: - get_attr: [NeutronBase, role_data, config_settings] diff --git a/puppet/services/neutron-plugin-ml2.yaml b/puppet/services/neutron-plugin-ml2.yaml index 3511b2f2..158122ed 100644 --- a/puppet/services/neutron-plugin-ml2.yaml +++ b/puppet/services/neutron-plugin-ml2.yaml @@ -61,7 +61,7 @@ outputs: role_data: description: Role data for the Neutron ML2 plugin. value: - service_name: neutron-plugin-ml2 + service_name: neutron_plugin_ml2 config_settings: map_merge: - get_attr: [NeutronBase, role_data, config_settings] diff --git a/puppet/services/neutron-plugin-nuage.yaml b/puppet/services/neutron-plugin-nuage.yaml index 3889f84a..5f228f96 100644 --- a/puppet/services/neutron-plugin-nuage.yaml +++ b/puppet/services/neutron-plugin-nuage.yaml @@ -59,7 +59,7 @@ outputs: role_data: description: Role data for the Neutron Nuage plugin value: - service_name: neutron-plugin-nuage + service_name: neutron_plugin_nuage config_settings: map_merge: - get_attr: [NeutronBase, role_data, config_settings] diff --git a/puppet/services/neutron-plugin-opencontrail.yaml b/puppet/services/neutron-plugin-opencontrail.yaml index 1d23c497..ed6a2c04 100644 --- a/puppet/services/neutron-plugin-opencontrail.yaml +++ b/puppet/services/neutron-plugin-opencontrail.yaml @@ -42,7 +42,7 @@ outputs: role_data: description: Role data for the Neutron Opencontrail plugin value: - service_name: neutron-plugin-opencontrail + service_name: neutron_plugin_opencontrail config_settings: map_merge: - get_attr: [NeutronBase, role_data, config_settings] diff --git a/puppet/services/neutron-plugin-plumgrid.yaml b/puppet/services/neutron-plugin-plumgrid.yaml index 484d163f..5ae699d5 100644 --- a/puppet/services/neutron-plugin-plumgrid.yaml +++ b/puppet/services/neutron-plugin-plumgrid.yaml @@ -80,7 +80,7 @@ outputs: role_data: description: Role data for the Neutron Plumgrid plugin value: - service_name: neutron-plugin-plumgrid + service_name: neutron_plugin_plumgrid config_settings: neutron::plugins::plumgrid::connection: list_join: diff --git a/puppet/services/neutron-server.yaml b/puppet/services/neutron-server.yaml index 253a6bfe..8c6a2537 100644 --- a/puppet/services/neutron-server.yaml +++ b/puppet/services/neutron-server.yaml @@ -39,7 +39,7 @@ outputs: role_data: description: Role data for the Neutron Server agent service. value: - service_name: neutron-server + service_name: neutron_server config_settings: map_merge: - get_attr: [NeutronBase, role_data, config_settings] diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml index 0dd8fd51..402c39e1 100644 --- a/puppet/services/nova-api.yaml +++ b/puppet/services/nova-api.yaml @@ -24,7 +24,7 @@ outputs: role_data: description: Role data for the Nova API service. value: - service_name: nova-api + service_name: nova_api config_settings: map_merge: - get_attr: [NovaBase, role_data, config_settings] diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml index c94e0246..16862615 100644 --- a/puppet/services/nova-base.yaml +++ b/puppet/services/nova-base.yaml @@ -40,7 +40,7 @@ outputs: role_data: description: Role data for the Nova base service. value: - service_name: nova-base + service_name: nova_base config_settings: nova::rabbit_password: {get_param: RabbitPassword} nova::rabbit_user: {get_param: RabbitUserName} diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml index a7226bd0..0bf27d13 100644 --- a/puppet/services/nova-compute.yaml +++ b/puppet/services/nova-compute.yaml @@ -26,7 +26,7 @@ outputs: role_data: description: Role data for the Nova Compute service. value: - service_name: nova-compute + service_name: nova_compute config_settings: map_merge: - get_attr: [NovaBase, role_data, config_settings] diff --git a/puppet/services/nova-conductor.yaml b/puppet/services/nova-conductor.yaml index c334de44..5964f883 100644 --- a/puppet/services/nova-conductor.yaml +++ b/puppet/services/nova-conductor.yaml @@ -24,7 +24,7 @@ outputs: role_data: description: Role data for the Nova Conductor service. value: - service_name: nova-conductor + service_name: nova_conductor config_settings: map_merge: - get_attr: [NovaBase, role_data, config_settings] diff --git a/puppet/services/nova-consoleauth.yaml b/puppet/services/nova-consoleauth.yaml index 0e7bf3b4..5fbce1b1 100644 --- a/puppet/services/nova-consoleauth.yaml +++ b/puppet/services/nova-consoleauth.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Nova Consoleauth service. value: - service_name: nova-consoleauth + service_name: nova_consoleauth config_settings: get_attr: [NovaBase, role_data, config_settings] step_config: | diff --git a/puppet/services/nova-libvirt.yaml b/puppet/services/nova-libvirt.yaml index 087ad277..939b6a09 100644 --- a/puppet/services/nova-libvirt.yaml +++ b/puppet/services/nova-libvirt.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Libvirt service. value: - service_name: nova-libvirt + service_name: nova_libvirt config_settings: map_merge: - get_attr: [NovaBase, role_data, config_settings] diff --git a/puppet/services/nova-scheduler.yaml b/puppet/services/nova-scheduler.yaml index 4187b728..bd6e5116 100644 --- a/puppet/services/nova-scheduler.yaml +++ b/puppet/services/nova-scheduler.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Nova Scheduler service. value: - service_name: nova-scheduler + service_name: nova_scheduler config_settings: map_merge: - get_attr: [NovaBase, role_data, config_settings] diff --git a/puppet/services/nova-vncproxy.yaml b/puppet/services/nova-vncproxy.yaml index d8e04cc8..f6812103 100644 --- a/puppet/services/nova-vncproxy.yaml +++ b/puppet/services/nova-vncproxy.yaml @@ -20,7 +20,7 @@ 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] step_config: | diff --git a/puppet/services/pacemaker/ceilometer-agent-central.yaml b/puppet/services/pacemaker/ceilometer-agent-central.yaml index 3ba78fc2..471b9f7a 100644 --- a/puppet/services/pacemaker/ceilometer-agent-central.yaml +++ b/puppet/services/pacemaker/ceilometer-agent-central.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Ceilometer Central Agent pacemaker role. value: - service_name: ceilometer-agent-central + service_name: ceilometer_agent_central config_settings: map_merge: - get_attr: [CeilometerServiceBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/ceilometer-agent-notification.yaml b/puppet/services/pacemaker/ceilometer-agent-notification.yaml index 0fb008c4..2530848f 100644 --- a/puppet/services/pacemaker/ceilometer-agent-notification.yaml +++ b/puppet/services/pacemaker/ceilometer-agent-notification.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Ceilometer Notification Agent pacemaker role. value: - service_name: ceilometer-agent-notification + service_name: ceilometer_agent_notification config_settings: map_merge: - get_attr: [CeilometerServiceBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/ceilometer-api.yaml b/puppet/services/pacemaker/ceilometer-api.yaml index 5cd8bb81..f1885372 100644 --- a/puppet/services/pacemaker/ceilometer-api.yaml +++ b/puppet/services/pacemaker/ceilometer-api.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Ceilometer API pacemaker role. value: - service_name: ceilometer-api + service_name: ceilometer_api config_settings: map_merge: - get_attr: [CeilometerServiceBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/ceilometer-collector.yaml b/puppet/services/pacemaker/ceilometer-collector.yaml index 9e3671e5..8d31e1aa 100644 --- a/puppet/services/pacemaker/ceilometer-collector.yaml +++ b/puppet/services/pacemaker/ceilometer-collector.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Ceilometer Collector pacemaker role. value: - service_name: ceilometer-collector + service_name: ceilometer_collector config_settings: map_merge: - get_attr: [CeilometerServiceBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/cinder-api.yaml b/puppet/services/pacemaker/cinder-api.yaml index d1313b27..706a189b 100644 --- a/puppet/services/pacemaker/cinder-api.yaml +++ b/puppet/services/pacemaker/cinder-api.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Cinder API role. value: - service_name: cinder-api + service_name: cinder_api config_settings: map_merge: - get_attr: [CinderApiBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/cinder-scheduler.yaml b/puppet/services/pacemaker/cinder-scheduler.yaml index c4e0a34f..350d7126 100644 --- a/puppet/services/pacemaker/cinder-scheduler.yaml +++ b/puppet/services/pacemaker/cinder-scheduler.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Cinder Scheduler role. value: - service_name: cinder-scheduler + service_name: cinder_scheduler config_settings: map_merge: - get_attr: [CinderSchedulerBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/cinder-volume.yaml b/puppet/services/pacemaker/cinder-volume.yaml index 3e28039e..7b6e9a77 100644 --- a/puppet/services/pacemaker/cinder-volume.yaml +++ b/puppet/services/pacemaker/cinder-volume.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Cinder Volume role. value: - service_name: cinder-volume + service_name: cinder_volume config_settings: map_merge: - get_attr: [CinderVolumeBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/glance-api.yaml b/puppet/services/pacemaker/glance-api.yaml index bc611b0a..4e27fd56 100644 --- a/puppet/services/pacemaker/glance-api.yaml +++ b/puppet/services/pacemaker/glance-api.yaml @@ -45,7 +45,7 @@ outputs: role_data: description: Role data for the Glance role. value: - service_name: glance-api + service_name: glance_api config_settings: map_merge: - get_attr: [GlanceApiBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/glance-registry.yaml b/puppet/services/pacemaker/glance-registry.yaml index 72ca9393..ae7aa307 100644 --- a/puppet/services/pacemaker/glance-registry.yaml +++ b/puppet/services/pacemaker/glance-registry.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Glance role. value: - service_name: glance-registry + service_name: glance_registry config_settings: map_merge: - get_attr: [GlanceRegistryBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/gnocchi-api.yaml b/puppet/services/pacemaker/gnocchi-api.yaml index 6c01bc53..bcd73e61 100644 --- a/puppet/services/pacemaker/gnocchi-api.yaml +++ b/puppet/services/pacemaker/gnocchi-api.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Gnocchi role. value: - service_name: gnocchi-api + service_name: gnocchi_api config_settings: map_merge: - get_attr: [GnocchiServiceBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/gnocchi-metricd.yaml b/puppet/services/pacemaker/gnocchi-metricd.yaml index 4895bac6..ec487e89 100644 --- a/puppet/services/pacemaker/gnocchi-metricd.yaml +++ b/puppet/services/pacemaker/gnocchi-metricd.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Gnocchi role. value: - service_name: gnocchi-metricd + service_name: gnocchi_metricd config_settings: map_merge: - get_attr: [GnocchiServiceBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/gnocchi-statsd.yaml b/puppet/services/pacemaker/gnocchi-statsd.yaml index 2760df37..d1106524 100644 --- a/puppet/services/pacemaker/gnocchi-statsd.yaml +++ b/puppet/services/pacemaker/gnocchi-statsd.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Gnocchi role. value: - service_name: gnocchi-statsd + service_name: gnocchi_statsd config_settings: map_merge: - get_attr: [GnocchiServiceBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/heat-api-cfn.yaml b/puppet/services/pacemaker/heat-api-cfn.yaml index bf01ceda..8f2c561a 100644 --- a/puppet/services/pacemaker/heat-api-cfn.yaml +++ b/puppet/services/pacemaker/heat-api-cfn.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Heat CloudFormation API role. value: - service_name: heat-api-cfn + service_name: heat_api_cfn config_settings: map_merge: - get_attr: [HeatApiCfnBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/heat-api-cloudwatch.yaml b/puppet/services/pacemaker/heat-api-cloudwatch.yaml index 6ee844d3..a08e0262 100644 --- a/puppet/services/pacemaker/heat-api-cloudwatch.yaml +++ b/puppet/services/pacemaker/heat-api-cloudwatch.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Heat Cloudwatch API role. value: - service_name: heat-api-cloudwatch + service_name: heat_api_cloudwatch config_settings: map_merge: - get_attr: [HeatApiCloudwatchBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/heat-api.yaml b/puppet/services/pacemaker/heat-api.yaml index 14604428..5cf25516 100644 --- a/puppet/services/pacemaker/heat-api.yaml +++ b/puppet/services/pacemaker/heat-api.yaml @@ -20,7 +20,7 @@ outputs: role_data: description: Role data for the Heat API role. value: - service_name: heat-api + service_name: heat_api config_settings: map_merge: - get_attr: [HeatApiBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/heat-engine.yaml b/puppet/services/pacemaker/heat-engine.yaml index 450917fd..4d41cbe4 100644 --- a/puppet/services/pacemaker/heat-engine.yaml +++ b/puppet/services/pacemaker/heat-engine.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Heat engine role. value: - service_name: heat-engine + service_name: heat_engine config_settings: map_merge: - get_attr: [HeatEngineBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/neutron-dhcp.yaml b/puppet/services/pacemaker/neutron-dhcp.yaml index 312e275f..3a5ada47 100644 --- a/puppet/services/pacemaker/neutron-dhcp.yaml +++ b/puppet/services/pacemaker/neutron-dhcp.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Neutron DHCP role. value: - service_name: neutron-dhcp + service_name: neutron_dhcp config_settings: map_merge: - get_attr: [NeutronDhcpBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/neutron-l3.yaml b/puppet/services/pacemaker/neutron-l3.yaml index 8607614b..a4f2c0e1 100644 --- a/puppet/services/pacemaker/neutron-l3.yaml +++ b/puppet/services/pacemaker/neutron-l3.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Neutron L3 role. value: - service_name: neutron-l3 + service_name: neutron_l3 config_settings: map_merge: - get_attr: [NeutronL3Base, role_data, config_settings] diff --git a/puppet/services/pacemaker/neutron-metadata.yaml b/puppet/services/pacemaker/neutron-metadata.yaml index 96f3fb4b..9b322f22 100644 --- a/puppet/services/pacemaker/neutron-metadata.yaml +++ b/puppet/services/pacemaker/neutron-metadata.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Neutron Metadata role. value: - service_name: neutron-metadata + service_name: neutron_metadata config_settings: map_merge: - get_attr: [NeutronMetadataBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/neutron-midonet.yaml b/puppet/services/pacemaker/neutron-midonet.yaml index 3c185da9..e93ed661 100644 --- a/puppet/services/pacemaker/neutron-midonet.yaml +++ b/puppet/services/pacemaker/neutron-midonet.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Neutron Midonet plugin. value: - service_name: neutron-midonet + service_name: neutron_midonet config_settings: map_merge: - get_attr: [NeutronMidonetBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/neutron-ovs-agent.yaml b/puppet/services/pacemaker/neutron-ovs-agent.yaml index 214dc1c0..b2260de9 100644 --- a/puppet/services/pacemaker/neutron-ovs-agent.yaml +++ b/puppet/services/pacemaker/neutron-ovs-agent.yaml @@ -19,7 +19,7 @@ outputs: role_data: description: Role data for the Neutron OVS agent service. value: - service_name: neutron-ovs-agent + service_name: neutron_ovs_agent config_settings: get_attr: [NeutronOvsBase, role_data, config_settings] step_config: | diff --git a/puppet/services/pacemaker/neutron-plugin-ml2.yaml b/puppet/services/pacemaker/neutron-plugin-ml2.yaml index a4c4a5e4..dc10d093 100644 --- a/puppet/services/pacemaker/neutron-plugin-ml2.yaml +++ b/puppet/services/pacemaker/neutron-plugin-ml2.yaml @@ -19,7 +19,7 @@ outputs: role_data: description: Role data for the Neutron ML2 plugin. value: - service_name: neutron-plugin-ml2 + service_name: neutron_plugin_ml2 config_settings: map_merge: - get_attr: [NeutronMl2Base, role_data, config_settings] diff --git a/puppet/services/pacemaker/neutron-plugin-nuage.yaml b/puppet/services/pacemaker/neutron-plugin-nuage.yaml index 64ad0f42..414c046c 100644 --- a/puppet/services/pacemaker/neutron-plugin-nuage.yaml +++ b/puppet/services/pacemaker/neutron-plugin-nuage.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Neutron Nuage plugin. value: - service_name: neutron-plugin-nuage + service_name: neutron_plugin_nuage config_settings: map_merge: - get_attr: [NeutronPluginNuageBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/neutron-plugin-opencontrail.yaml b/puppet/services/pacemaker/neutron-plugin-opencontrail.yaml index f2fd5b92..1d385d83 100644 --- a/puppet/services/pacemaker/neutron-plugin-opencontrail.yaml +++ b/puppet/services/pacemaker/neutron-plugin-opencontrail.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Neutron OpenContrail plugin. value: - service_name: neutron-plugin-opencontrail + service_name: neutron_plugin_opencontrail config_settings: map_merge: - get_attr: [NeutronPluginOpenContrail, role_data, config_settings] diff --git a/puppet/services/pacemaker/neutron-plugin-plumgrid.yaml b/puppet/services/pacemaker/neutron-plugin-plumgrid.yaml index 9ceaf004..69f5fd27 100644 --- a/puppet/services/pacemaker/neutron-plugin-plumgrid.yaml +++ b/puppet/services/pacemaker/neutron-plugin-plumgrid.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Neutron PLUMgrid plugin. value: - service_name: neutron-plugin-plumgrid + service_name: neutron_plugin_plumgrid config_settings: map_merge: - get_attr: [NeutronPluginPlumgridBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/neutron-server.yaml b/puppet/services/pacemaker/neutron-server.yaml index 74234a85..b0f739dc 100644 --- a/puppet/services/pacemaker/neutron-server.yaml +++ b/puppet/services/pacemaker/neutron-server.yaml @@ -25,7 +25,7 @@ outputs: role_data: description: Role data for the Neutron Server. value: - service_name: neutron-server + service_name: neutron_server config_settings: map_merge: - get_attr: [NeutronServerBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/nova-api.yaml b/puppet/services/pacemaker/nova-api.yaml index 467955fa..2d497ab5 100644 --- a/puppet/services/pacemaker/nova-api.yaml +++ b/puppet/services/pacemaker/nova-api.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Nova API role. value: - service_name: nova-api + service_name: nova_api config_settings: map_merge: - get_attr: [NovaApiBase, role_data, config_settings] 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] diff --git a/puppet/services/pacemaker/nova-consoleauth.yaml b/puppet/services/pacemaker/nova-consoleauth.yaml index cc683eb5..bbab8bea 100644 --- a/puppet/services/pacemaker/nova-consoleauth.yaml +++ b/puppet/services/pacemaker/nova-consoleauth.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Nova Consoleauth role. value: - service_name: nova-consoleauth + service_name: nova_consoleauth config_settings: map_merge: - get_attr: [NovaConsoleauthBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/nova-scheduler.yaml b/puppet/services/pacemaker/nova-scheduler.yaml index dbb643c5..bf2c62bc 100644 --- a/puppet/services/pacemaker/nova-scheduler.yaml +++ b/puppet/services/pacemaker/nova-scheduler.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Nova Scheduler role. value: - service_name: nova-scheduler + service_name: nova_scheduler config_settings: map_merge: - get_attr: [NovaSchedulerBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/nova-vncproxy.yaml b/puppet/services/pacemaker/nova-vncproxy.yaml index 8fb07d57..0353d924 100644 --- a/puppet/services/pacemaker/nova-vncproxy.yaml +++ b/puppet/services/pacemaker/nova-vncproxy.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Nova Vncproxy role. value: - service_name: nova-vncproxy + service_name: nova_vncproxy config_settings: map_merge: - get_attr: [NovaVncproxyBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/sahara-api.yaml b/puppet/services/pacemaker/sahara-api.yaml index a4dfa137..ac05a01a 100644 --- a/puppet/services/pacemaker/sahara-api.yaml +++ b/puppet/services/pacemaker/sahara-api.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Sahara API role. value: - service_name: sahara-api + service_name: sahara_api config_settings: map_merge: - get_attr: [SaharaApiBase, role_data, config_settings] diff --git a/puppet/services/pacemaker/sahara-engine.yaml b/puppet/services/pacemaker/sahara-engine.yaml index 31d9bea5..f6bd8f61 100644 --- a/puppet/services/pacemaker/sahara-engine.yaml +++ b/puppet/services/pacemaker/sahara-engine.yaml @@ -21,7 +21,7 @@ outputs: role_data: description: Role data for the Sahara Engine role. value: - service_name: sahara-engine + service_name: sahara_engine config_settings: map_merge: - get_attr: [SaharaEngineBase, role_data, config_settings] diff --git a/puppet/services/sahara-api.yaml b/puppet/services/sahara-api.yaml index c9112019..7ca9bbd5 100644 --- a/puppet/services/sahara-api.yaml +++ b/puppet/services/sahara-api.yaml @@ -34,7 +34,7 @@ outputs: role_data: description: Role data for the Sahara API role. value: - service_name: sahara-api + service_name: sahara_api config_settings: map_merge: - get_attr: [SaharaBase, role_data, config_settings] diff --git a/puppet/services/sahara-base.yaml b/puppet/services/sahara-base.yaml index 72fc33a3..981b7c05 100644 --- a/puppet/services/sahara-base.yaml +++ b/puppet/services/sahara-base.yaml @@ -31,7 +31,7 @@ outputs: role_data: description: Role data for the Sahara base service. value: - service_name: sahara-base + service_name: sahara_base config_settings: sahara::rabbit_password: {get_param: RabbitPassword} sahara::rabbit_user: {get_param: RabbitUserName} diff --git a/puppet/services/sahara-engine.yaml b/puppet/services/sahara-engine.yaml index b799e27c..548d961f 100644 --- a/puppet/services/sahara-engine.yaml +++ b/puppet/services/sahara-engine.yaml @@ -23,7 +23,7 @@ outputs: role_data: description: Role data for the Sahara Engine role. value: - service_name: sahara-engine + service_name: sahara_engine config_settings: map_merge: - get_attr: [SaharaBase, role_data, config_settings] diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml index 12165cc1..dcd2c2a4 100644 --- a/puppet/services/swift-proxy.yaml +++ b/puppet/services/swift-proxy.yaml @@ -35,7 +35,7 @@ outputs: role_data: description: Role data for the Swift proxy service. value: - service_name: swift-proxy + service_name: swift_proxy config_settings: # Swift swift::proxy::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} diff --git a/puppet/services/swift-ringbuilder.yaml b/puppet/services/swift-ringbuilder.yaml index b341b0fc..0b17c73c 100644 --- a/puppet/services/swift-ringbuilder.yaml +++ b/puppet/services/swift-ringbuilder.yaml @@ -30,7 +30,7 @@ outputs: role_data: description: Role data for Swift Ringbuilder configuration. value: - service_name: swift-ringbuilder + service_name: swift_ringbuilder config_settings: tripleo::profile::base::swift::ringbuilder::build_ring: {get_param: SwiftRingBuild} tripleo::profile::base::swift::ringbuilder::replicas: {get_param: SwiftReplicas} diff --git a/puppet/services/swift-storage.yaml b/puppet/services/swift-storage.yaml index d63dc87c..effdaf63 100644 --- a/puppet/services/swift-storage.yaml +++ b/puppet/services/swift-storage.yaml @@ -36,7 +36,7 @@ outputs: role_data: description: Role data for the Swift Proxy role. value: - service_name: swift-storage + service_name: swift_storage config_settings: # Swift swift::storage::all::mount_check: {get_param: SwiftMountCheck} diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index 34219eff..c93c84bc 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -33,8 +33,9 @@ def validate_service(filename, tpl): print('ERROR: service_name is required in role_data for %s.' % filename) return 1 + # service_name must match the filename, but with an underscore if (role_data['service_name'] != - os.path.basename(filename).split('.')[0]): + os.path.basename(filename).split('.')[0].replace("-", "_")): print('ERROR: service_name should match file name for service: %s.' % filename) return 1 |