Convert service_name to underscore syntax
Currently we use hyphens, e.g cinder-api, but in overcloud.yaml we have a lot of references to services (e.g for AllNodesConfig) by underscore, e.g cinder_api. To enable dynamic generation of this data, we need the service name in underscore format. Change-Id: Ief13dfe5d8d7691dfe2534ad5c39d7eacbcb6f70
This commit is contained in:
Steven Hardy
parent
fc93cf3e29
commit
7df649f59e
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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: |
|
||||
|
|
|
|||
|
|
@ -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: |
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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: |
|
||||
|
|
|
|||
|
|
@ -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: |
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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: |
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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: |
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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: |
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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: |
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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: |
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
|
|||
|
|
@ -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]}
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue