Browse Source

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
changes/40/348440/1
Steven Hardy 5 years ago
parent
commit
7df649f59e
  1. 2
      puppet/services/ceilometer-agent-central.yaml
  2. 2
      puppet/services/ceilometer-agent-compute.yaml
  3. 2
      puppet/services/ceilometer-agent-notification.yaml
  4. 2
      puppet/services/ceilometer-api.yaml
  5. 2
      puppet/services/ceilometer-base.yaml
  6. 2
      puppet/services/ceilometer-collector.yaml
  7. 2
      puppet/services/ceilometer-expirer.yaml
  8. 2
      puppet/services/ceph-base.yaml
  9. 2
      puppet/services/ceph-client.yaml
  10. 2
      puppet/services/ceph-external.yaml
  11. 2
      puppet/services/ceph-mon.yaml
  12. 2
      puppet/services/ceph-osd.yaml
  13. 2
      puppet/services/cinder-api.yaml
  14. 2
      puppet/services/cinder-base.yaml
  15. 2
      puppet/services/cinder-scheduler.yaml
  16. 2
      puppet/services/cinder-volume.yaml
  17. 2
      puppet/services/database/mongodb-base.yaml
  18. 2
      puppet/services/database/redis-base.yaml
  19. 2
      puppet/services/glance-api.yaml
  20. 2
      puppet/services/glance-registry.yaml
  21. 2
      puppet/services/gnocchi-api.yaml
  22. 2
      puppet/services/gnocchi-base.yaml
  23. 2
      puppet/services/gnocchi-metricd.yaml
  24. 2
      puppet/services/gnocchi-statsd.yaml
  25. 2
      puppet/services/heat-api-cfn.yaml
  26. 2
      puppet/services/heat-api-cloudwatch.yaml
  27. 2
      puppet/services/heat-api.yaml
  28. 2
      puppet/services/heat-base.yaml
  29. 2
      puppet/services/heat-engine.yaml
  30. 2
      puppet/services/ironic-api.yaml
  31. 2
      puppet/services/ironic-base.yaml
  32. 2
      puppet/services/ironic-conductor.yaml
  33. 2
      puppet/services/neutron-base.yaml
  34. 2
      puppet/services/neutron-compute-plugin-midonet.yaml
  35. 2
      puppet/services/neutron-compute-plugin-nuage.yaml
  36. 2
      puppet/services/neutron-compute-plugin-opencontrail.yaml
  37. 2
      puppet/services/neutron-compute-plugin-plumgrid.yaml
  38. 2
      puppet/services/neutron-dhcp.yaml
  39. 2
      puppet/services/neutron-l3.yaml
  40. 2
      puppet/services/neutron-metadata.yaml
  41. 2
      puppet/services/neutron-midonet.yaml
  42. 2
      puppet/services/neutron-ovs-agent.yaml
  43. 2
      puppet/services/neutron-plugin-ml2.yaml
  44. 2
      puppet/services/neutron-plugin-nuage.yaml
  45. 2
      puppet/services/neutron-plugin-opencontrail.yaml
  46. 2
      puppet/services/neutron-plugin-plumgrid.yaml
  47. 2
      puppet/services/neutron-server.yaml
  48. 2
      puppet/services/nova-api.yaml
  49. 2
      puppet/services/nova-base.yaml
  50. 2
      puppet/services/nova-compute.yaml
  51. 2
      puppet/services/nova-conductor.yaml
  52. 2
      puppet/services/nova-consoleauth.yaml
  53. 2
      puppet/services/nova-libvirt.yaml
  54. 2
      puppet/services/nova-scheduler.yaml
  55. 2
      puppet/services/nova-vncproxy.yaml
  56. 2
      puppet/services/pacemaker/ceilometer-agent-central.yaml
  57. 2
      puppet/services/pacemaker/ceilometer-agent-notification.yaml
  58. 2
      puppet/services/pacemaker/ceilometer-api.yaml
  59. 2
      puppet/services/pacemaker/ceilometer-collector.yaml
  60. 2
      puppet/services/pacemaker/cinder-api.yaml
  61. 2
      puppet/services/pacemaker/cinder-scheduler.yaml
  62. 2
      puppet/services/pacemaker/cinder-volume.yaml
  63. 2
      puppet/services/pacemaker/glance-api.yaml
  64. 2
      puppet/services/pacemaker/glance-registry.yaml
  65. 2
      puppet/services/pacemaker/gnocchi-api.yaml
  66. 2
      puppet/services/pacemaker/gnocchi-metricd.yaml
  67. 2
      puppet/services/pacemaker/gnocchi-statsd.yaml
  68. 2
      puppet/services/pacemaker/heat-api-cfn.yaml
  69. 2
      puppet/services/pacemaker/heat-api-cloudwatch.yaml
  70. 2
      puppet/services/pacemaker/heat-api.yaml
  71. 2
      puppet/services/pacemaker/heat-engine.yaml
  72. 2
      puppet/services/pacemaker/neutron-dhcp.yaml
  73. 2
      puppet/services/pacemaker/neutron-l3.yaml
  74. 2
      puppet/services/pacemaker/neutron-metadata.yaml
  75. 2
      puppet/services/pacemaker/neutron-midonet.yaml
  76. 2
      puppet/services/pacemaker/neutron-ovs-agent.yaml
  77. 2
      puppet/services/pacemaker/neutron-plugin-ml2.yaml
  78. 2
      puppet/services/pacemaker/neutron-plugin-nuage.yaml
  79. 2
      puppet/services/pacemaker/neutron-plugin-opencontrail.yaml
  80. 2
      puppet/services/pacemaker/neutron-plugin-plumgrid.yaml
  81. 2
      puppet/services/pacemaker/neutron-server.yaml
  82. 2
      puppet/services/pacemaker/nova-api.yaml
  83. 2
      puppet/services/pacemaker/nova-conductor.yaml
  84. 2
      puppet/services/pacemaker/nova-consoleauth.yaml
  85. 2
      puppet/services/pacemaker/nova-scheduler.yaml
  86. 2
      puppet/services/pacemaker/nova-vncproxy.yaml
  87. 2
      puppet/services/pacemaker/sahara-api.yaml
  88. 2
      puppet/services/pacemaker/sahara-engine.yaml
  89. 2
      puppet/services/sahara-api.yaml
  90. 2
      puppet/services/sahara-base.yaml
  91. 2
      puppet/services/sahara-engine.yaml
  92. 2
      puppet/services/swift-proxy.yaml
  93. 2
      puppet/services/swift-ringbuilder.yaml
  94. 2
      puppet/services/swift-storage.yaml
  95. 3
      tools/yaml-validate.py

2
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]

2
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: |

2
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: |

2
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]

2
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:

2
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: |

2
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: |

2
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}

2
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: |

2
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}

2
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]

2
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]

2
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]

2
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:

2
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: |

2
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]

2
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}

2
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}

2
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:

2
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:

2
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]

2
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}

2
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]

2
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]

2
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]

2
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]

2
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]

2
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}

2
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]

2
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]

2
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:

2
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]

2
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}

2
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

2
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}

2
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

2
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

2
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]

2
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]

2
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]

2
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}

2
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]

2
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]

2
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]

2
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]

2
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:

2
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]

2
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]

2
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}

2
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]

2
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]

2
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: |

2
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]

2
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]

2
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: |

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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: |

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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]

2
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}

2
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]

2
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]}

2
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}

2
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}

3
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

Loading…
Cancel
Save