Add 'service_name' to composable services

This patch adds a new service_name section to each composable
service. We now have an explicit unit test check to ensure that
service_name exists in tools/yaml-validate.py.

This patch also wires service_names into hieradata on each
of the roles so that tools can access the deployed services locally
during deployment and upgrades.

Change-Id: I60861c5aa760534db3e314bba16a13b90ea72f0c

overcloud.yaml

@@ -731,6 +731,7 @@ resources:
           ServerMetadata: {get_param: ServerMetadata}
           SchedulerHints: {get_param: ControllerSchedulerHints}
           ServiceConfigSettings: {get_attr: [ControllerServiceChain, role_data, config_settings]}
+          ServiceNames: {get_attr: [ControllerServiceChain, role_data, service_names]}
 
   ComputeServiceChain:
 
@@ -793,6 +794,7 @@ resources:
           SchedulerHints: {get_param: NovaComputeSchedulerHints}
           NodeIndex: '%index%'
           ServiceConfigSettings: {get_attr: [ComputeServiceChain, role_data, config_settings]}
+          ServiceNames: {get_attr: [ComputeServiceChain, role_data, service_names]}
 
   BlockStorageServiceChain:
     type: OS::TripleO::Services
@@ -826,6 +828,7 @@ resources:
           SchedulerHints: {get_param: BlockStorageSchedulerHints}
           NodeIndex: '%index%'
           ServiceConfigSettings: {get_attr: [BlockStorageServiceChain, role_data, config_settings]}
+          ServiceNames: {get_attr: [BlockStorageServiceChain, role_data, service_names]}
 
   ObjectStorageServiceChain:
     type: OS::TripleO::Services
@@ -863,6 +866,7 @@ resources:
           SchedulerHints: {get_param: ObjectStorageSchedulerHints}
           NodeIndex: '%index%'
           ServiceConfigSettings: {get_attr: [ObjectStorageServiceChain, role_data, config_settings]}
+          ServiceNames: {get_attr: [ObjectStorageServiceChain, role_data, service_names]}
 
   CephStorageServiceChain:
     type: OS::TripleO::Services
@@ -896,6 +900,7 @@ resources:
           SchedulerHints: {get_param: CephStorageSchedulerHints}
           NodeIndex: '%index%'
           ServiceConfigSettings: {get_attr: [CephStorageServiceChain, role_data, config_settings]}
+          ServiceNames: {get_attr: [CephStorageServiceChain, role_data, service_names]}
 
   ControllerIpListMap:
     type: OS::TripleO::Network::Ports::NetIpListMap

puppet/ceph-storage.yaml

@@ -91,6 +91,9 @@ parameters:
   ServiceConfigSettings:
     type: json
     default: {}
+  ServiceNames:
+    type: comma_delimited_list
+    default: []
   ConfigCommand:
     type: string
     description: Command which will be run whenever configuration data changes
@@ -247,6 +250,7 @@ resources:
             - heat_config_%{::deploy_config_name}
             - ceph_extraconfig
             - extraconfig
+            - service_names
             - service_configs
             - ceph_cluster # provided by CephClusterConfig
             - ceph
@@ -256,6 +260,9 @@ resources:
             - network
           merge_behavior: deeper
           datafiles:
+            service_names:
+              mapped_data:
+                service_names: {get_param: ServiceNames}
             service_configs:
               mapped_data: {get_param: ServiceConfigSettings}
             common:

puppet/cinder-storage.yaml

@@ -91,6 +91,9 @@ parameters:
   ServiceConfigSettings:
     type: json
     default: {}
+  ServiceNames:
+    type: comma_delimited_list
+    default: []
   ConfigCommand:
     type: string
     description: Command which will be run whenever configuration data changes
@@ -253,6 +256,7 @@ resources:
             - heat_config_%{::deploy_config_name}
             - volume_extraconfig
             - extraconfig
+            - service_names
             - service_configs
             - volume
             - all_nodes # provided by allNodesConfig
@@ -261,6 +265,9 @@ resources:
             - network
           merge_behavior: deeper
           datafiles:
+            service_names:
+              mapped_data:
+                service_names: {get_param: ServiceNames}
             service_configs:
               mapped_data: {get_param: ServiceConfigSettings}
             common:

puppet/compute.yaml

@@ -212,6 +212,9 @@ parameters:
   ServiceConfigSettings:
     type: json
     default: {}
+  ServiceNames:
+    type: comma_delimited_list
+    default: []
   ConfigCommand:
     type: string
     description: Command which will be run whenever configuration data changes
@@ -361,6 +364,7 @@ resources:
             - heat_config_%{::deploy_config_name}
             - compute_extraconfig
             - extraconfig
+            - service_names
             - service_configs
             - compute
             - ceph_cluster # provided by CephClusterConfig
@@ -376,6 +380,9 @@ resources:
             - neutron_opencontrail_data  # Optionally provided by ComputeExtraConfigPre
           merge_behavior: deeper
           datafiles:
+            service_names:
+              mapped_data:
+                service_names: {get_param: ServiceNames}
             service_configs:
               mapped_data: {get_param: ServiceConfigSettings}
             compute_extraconfig:

puppet/controller.yaml

@@ -334,6 +334,9 @@ parameters:
   ServiceConfigSettings:
     type: json
     default: {}
+  ServiceNames:
+    type: comma_delimited_list
+    default: []
   ConfigCommand:
     type: string
     description: Command which will be run whenever configuration data changes
@@ -660,6 +663,7 @@ resources:
             - controller_extraconfig
             - extraconfig
             - service_configs
+            - service_names
             - controller
             - database
             - object
@@ -681,6 +685,9 @@ resources:
             - midonet_data #Optionally provided by AllNodesExtraConfig
           merge_behavior: deeper
           datafiles:
+            service_names:
+              mapped_data:
+                service_names: {get_param: ServiceNames}
             service_configs:
               mapped_data: {get_param: ServiceConfigSettings}
             controller_extraconfig:

puppet/services/ceilometer-agent-central.yaml

@@ -28,6 +28,7 @@ outputs:
   role_data:
     description: Role data for the Ceilometer Central Agent role.
     value:
+      service_name: ceilometer-agent-central
       config_settings:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]

puppet/services/ceilometer-agent-compute.yaml

@@ -20,6 +20,7 @@ outputs:
   role_data:
     description: Role data for the Ceilometer Compute Agent role.
     value:
+      service_name: ceilometer-agent-compute
       config_settings:
         get_attr: [CeilometerServiceBase, role_data, config_settings]
       step_config: |

puppet/services/ceilometer-agent-notification.yaml

@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Ceilometer Notification Agent role.
     value:
+      service_name: ceilometer-agent-notification
       config_settings:
         get_attr: [CeilometerServiceBase, role_data, config_settings]
       step_config: |

puppet/services/ceilometer-api.yaml

@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Ceilometer API role.
     value:
+      service_name: ceilometer-api
       config_settings:
         get_attr: [CeilometerServiceBase, role_data, config_settings]
       step_config: |

puppet/services/ceilometer-base.yaml

@@ -62,6 +62,7 @@ outputs:
   role_data:
     description: Role data for the Ceilometer role.
     value:
+      service_name: ceilometer-base
       config_settings:
         ceilometer::db::database_connection:
           list_join:

puppet/services/ceilometer-collector.yaml

@@ -20,6 +20,7 @@ outputs:
   role_data:
     description: Role data for the Ceilometer Collector role.
     value:
+      service_name: ceilometer-collector
       config_settings:
         get_attr: [CeilometerServiceBase, role_data, config_settings]
       step_config: |

puppet/services/ceilometer-expirer.yaml

@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Ceilometer Expirer role.
     value:
+      service_name: ceilometer-expirer
       config_settings:
         get_attr: [CeilometerServiceBase, role_data, config_settings]
       step_config: |

puppet/services/ceph-base.yaml

@@ -57,6 +57,7 @@ outputs:
   role_data:
     description: Role data for the Ceph base service.
     value:
+      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}

puppet/services/ceph-client.yaml

@@ -18,6 +18,7 @@ outputs:
   role_data:
     description: Role data for the Cinder OSD service.
     value:
+      service_name: ceph-client
       config_settings:
         get_attr: [CephBase, role_data, config_settings]
       step_config: |

puppet/services/ceph-external.yaml

@@ -40,6 +40,7 @@ outputs:
   role_data:
     description: Role data for the Ceph External service.
     value:
+      service_name: ceph-external
       config_settings:
         tripleo::profile::base::ceph::ceph_mon_host: {get_param: CephExternalMonHost}
         ceph::profile::params::fsid: {get_param: CephClusterFSID}

puppet/services/ceph-mon.yaml

@@ -41,6 +41,7 @@ outputs:
   role_data:
     description: Role data for the Ceph Monitor service.
     value:
+      service_name: ceph-mon
       config_settings:
         map_merge:
           - get_attr: [CephBase, role_data, config_settings]

puppet/services/ceph-osd.yaml

@@ -18,6 +18,7 @@ outputs:
   role_data:
     description: Role data for the Cinder OSD service.
     value:
+      service_name: ceph-osd
       config_settings:
         get_attr: [CephBase, role_data, config_settings]
       step_config: |

puppet/services/cinder-api.yaml

@@ -30,6 +30,7 @@ outputs:
   role_data:
     description: Role data for the Cinder API role.
     value:
+      service_name: cinder-api
       config_settings:
         map_merge:
           - get_attr: [CinderBase, role_data, config_settings]

puppet/services/cinder-base.yaml

@@ -40,6 +40,7 @@ outputs:
   role_data:
     description: Role data for the Cinder base service.
     value:
+      service_name: cinder-base
       config_settings:
         cinder::database_connection:
           list_join:

puppet/services/cinder-scheduler.yaml

@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Cinder Scheduler role.
     value:
+      service_name: cinder-scheduler
       config_settings:
         get_attr: [CinderBase, role_data, config_settings]
       step_config: |

puppet/services/cinder-volume.yaml

@@ -59,6 +59,7 @@ outputs:
   role_data:
     description: Role data for the Cinder Volume role.
     value:
+      service_name: cinder-volume
       config_settings:
         map_merge:
           - get_attr: [CinderBase, role_data, config_settings]

puppet/services/database/mongodb-base.yaml

@@ -24,6 +24,7 @@ outputs:
   role_data:
     description: Role data for the MongoDB base service.
     value:
+      service_name: mongodb-base
       config_settings:
         mongodb::server::nojournal: {get_param: MongoDbNoJournal}
         mongodb::server::ipv6: {get_param: MongoDbIPv6}

puppet/services/database/mongodb.yaml

@@ -19,6 +19,7 @@ outputs:
   role_data:
     description: Service mongodb using composable services.
     value:
+      service_name: mongodb
       config_settings:
         map_merge:
           - get_attr: [MongoDbBase, role_data, config_settings]

puppet/services/database/mysql.yaml

@@ -15,6 +15,7 @@ outputs:
   role_data:
     description: Service MySQL using composable services.
     value:
+      service_name: mysql
       config_settings:
       step_config: |
         include ::tripleo::profile::base::database::mysql

puppet/services/database/redis-base.yaml

@@ -13,6 +13,7 @@ outputs:
   role_data:
     description: Role data for the redis role.
     value:
+      service_name: redis-base
       config_settings:
        redis::requirepass: {get_param: RedisPassword}
        redis::masterauth: {get_param: RedisPassword}

puppet/services/database/redis.yaml

@@ -18,6 +18,7 @@ outputs:
   role_data:
     description: Role data for the redis role.
     value:
+      service_name: redis
       config_settings:
         map_merge:
           - get_attr: [RedisBase, role_data, config_settings]

puppet/services/glance-api.yaml

@@ -65,6 +65,7 @@ outputs:
   role_data:
     description: Role data for the Glance API role.
     value:
+      service_name: glance-api
       config_settings:
         glance::api::database_connection:
           list_join:

puppet/services/glance-registry.yaml

@@ -26,6 +26,7 @@ outputs:
   role_data:
     description: Role data for the Glance Registry role.
     value:
+      service_name: glance-registry
       config_settings:
         glance::registry::database_connection:
           list_join:

puppet/services/gnocchi-api.yaml

@@ -20,6 +20,7 @@ outputs:
   role_data:
     description: Role data for the Gnocchi role.
     value:
+      service_name: gnocchi-api
       config_settings:
         map_merge:
           - get_attr: [GnocchiServiceBase, role_data, config_settings]

puppet/services/gnocchi-base.yaml

@@ -39,6 +39,7 @@ outputs:
   role_data:
     description: Shared role data for the Heat services.
     value:
+      service_name: gnocchi-base
       config_settings:
         #Gnocchi engine
         gnocchi::debug: {get_input: debug}

puppet/services/gnocchi-metricd.yaml

@@ -20,6 +20,7 @@ outputs:
   role_data:
     description: Role data for the Gnocchi role.
     value:
+      service_name: gnocchi-metricd
       config_settings:
         map_merge:
           - get_attr: [GnocchiServiceBase, role_data, config_settings]

puppet/services/gnocchi-statsd.yaml

@@ -20,6 +20,7 @@ outputs:
   role_data:
     description: Role data for the Gnocchi role.
     value:
+      service_name: gnocchi-statsd
       config_settings:
         map_merge:
           - get_attr: [GnocchiServiceBase, role_data, config_settings]

puppet/services/haproxy.yaml

@@ -14,5 +14,6 @@ outputs:
   role_data:
     description: Role data for the HAproxy role.
     value:
+      service_name: haproxy
       step_config: |
         include ::tripleo::profile::base::haproxy

puppet/services/heat-api-cfn.yaml

@@ -30,6 +30,7 @@ outputs:
   role_data:
     description: Role data for the Heat CloudFormation API role.
     value:
+      service_name: heat-api-cfn
       config_settings:
         map_merge:
           - get_attr: [HeatBase, role_data, config_settings]

puppet/services/heat-api-cloudwatch.yaml

@@ -22,6 +22,7 @@ outputs:
   role_data:
     description: Role data for the Heat Cloudwatch API role.
     value:
+      service_name: heat-api-cloudwatch
       config_settings:
         map_merge:
           - get_attr: [HeatBase, role_data, config_settings]

puppet/services/heat-api.yaml

@@ -30,6 +30,7 @@ outputs:
   role_data:
     description: Role data for the Heat API role.
     value:
+      service_name: heat-api
       config_settings:
         map_merge:
           - get_attr: [HeatBase, role_data, config_settings]

puppet/services/heat-base.yaml

@@ -31,6 +31,7 @@ outputs:
   role_data:
     description: Shared role data for the Heat services.
     value:
+      service_name: heat-base
       config_settings:
         heat::rabbit_userid: {get_param: RabbitUserName}
         heat::rabbit_password: {get_param: RabbitPassword}

puppet/services/heat-engine.yaml

@@ -35,6 +35,7 @@ outputs:
   role_data:
     description: Role data for the Heat Engine role.
     value:
+      service_name: heat-engine
       config_settings:
         map_merge:
           - get_attr: [HeatBase, role_data, config_settings]

puppet/services/horizon.yaml

@@ -23,6 +23,7 @@ outputs:
   role_data:
     description: Role data for the Horizon role.
     value:
+      service_name: horizon
       config_settings:
         horizon::allowed_hosts: {get_param: HorizonAllowedHosts}
         neutron::plugins::ml2::mechanism_drivers:

puppet/services/ironic-api.yaml

@@ -24,6 +24,7 @@ outputs:
   role_data:
     description: Role data for the Ironic API role.
     value:
+      service_name: ironic-api
       config_settings:
         map_merge:
           - get_attr: [IronicBase, role_data, config_settings]

puppet/services/ironic-base.yaml

@@ -40,6 +40,7 @@ outputs:
   role_data:
     description: Role data for the Ironic role.
     value:
+      service_name: ironic-base
       config_settings:
         ironic::database_connection:
           list_join:

puppet/services/ironic-conductor.yaml

@@ -24,6 +24,7 @@ outputs:
   role_data:
     description: Role data for the Ironic conductor role.
     value:
+      service_name: ironic-conductor
       config_settings:
         map_merge:
           - get_attr: [IronicBase, role_data, config_settings]

puppet/services/keepalived.yaml

@@ -14,5 +14,6 @@ outputs:
   role_data:
     description: Role data for the Keepalived role.
     value:
+      service_name: keepalived
       step_config: |
         include ::tripleo::profile::base::keepalived

puppet/services/kernel.yaml

@@ -14,5 +14,6 @@ outputs:
   role_data:
     description: Role data for the Kernel modules
     value:
+      service_name: kernel
       step_config: |
         include ::tripleo::profile::base::kernel

puppet/services/keystone.yaml

@@ -92,6 +92,7 @@ outputs:
   role_data:
     description: Role data for the Keystone role.
     value:
+      service_name: keystone
       config_settings:
         keystone::database_connection:
           list_join:

puppet/services/memcached.yaml

@@ -14,6 +14,7 @@ outputs:
   role_data:
     description: Role data for the Memcached role.
     value:
+      service_name: memcached
       config_settings:
       step_config: |
         include ::tripleo::profile::base::memcached

puppet/services/neutron-base.yaml

@@ -47,6 +47,7 @@ outputs:
   role_data:
     description: Role data for the Neutron base service.
     value:
+      service_name: neutron-base
       config_settings:
         neutron::rabbit_password: {get_param: RabbitPassword}
         neutron::rabbit_user: {get_param: RabbitUserName}

puppet/services/neutron-compute-plugin-midonet.yaml

@@ -14,6 +14,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Compute Plumgrid plugin
     value:
+      service_name: neutron-compute-plugin-midonet
       config_settings:
       step_config: |
         include ::tripleo::profile::base::neutron::agents::midonet

puppet/services/neutron-compute-plugin-nuage.yaml

@@ -18,6 +18,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Compute Nuage plugin
     value:
+      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}

puppet/services/neutron-compute-plugin-opencontrail.yaml

@@ -14,6 +14,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Compute OpenContrail plugin
     value:
+      service_name: neutron-compute-plugin-opencontrail
       config_settings:
       step_config: |
         include ::tripleo::profile::base::neutron::opencontrail::vrouter

puppet/services/neutron-compute-plugin-plumgrid.yaml

@@ -14,6 +14,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Compute Plumgrid plugin
     value:
+      service_name: neutron-compute-plugin-plumgrid
       config_settings:
       step_config: |
         include tripleo::profile::base::neutron::plumgrid

puppet/services/neutron-dhcp.yaml

@@ -23,6 +23,7 @@ outputs:
   role_data:
     description: Role data for the Neutron DHCP agent service.
     value:
+      service_name: neutron-dhcp
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]

puppet/services/neutron-l3.yaml

@@ -26,6 +26,7 @@ outputs:
   role_data:
     description: Role data for the Neutron L3 agent service.
     value:
+      service_name: neutron-l3
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]

puppet/services/neutron-metadata.yaml

@@ -31,6 +31,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Metadata agent service.
     value:
+      service_name: neutron-metadata
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]

puppet/services/neutron-midonet.yaml

@@ -36,6 +36,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Midonet plugin and services
     value:
+      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}

puppet/services/neutron-ovs-agent.yaml

@@ -47,6 +47,7 @@ outputs:
   role_data:
     description: Role data for the Neutron OVS agent service.
     value:
+      service_name: neutron-ovs-agent
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]

puppet/services/neutron-plugin-ml2.yaml

@@ -61,6 +61,7 @@ outputs:
   role_data:
     description: Role data for the Neutron ML2 plugin.
     value:
+      service_name: neutron-plugin-ml2
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]

puppet/services/neutron-plugin-nuage.yaml

@@ -59,6 +59,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Nuage plugin
     value:
+      service_name: neutron-plugin-nuage
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]

puppet/services/neutron-plugin-opencontrail.yaml

@@ -42,6 +42,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Opencontrail plugin
     value:
+      service_name: neutron-plugin-opencontrail
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]

puppet/services/neutron-plugin-plumgrid.yaml

@@ -80,6 +80,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Plumgrid plugin
     value:
+      service_name: neutron-plugin-plumgrid
       config_settings:
         neutron::plugins::plumgrid::connection:
           list_join:

puppet/services/neutron-server.yaml

@@ -39,6 +39,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Server agent service.
     value:
+      service_name: neutron-server
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]

puppet/services/nova-api.yaml

@@ -22,6 +22,7 @@ outputs:
   role_data:
     description: Role data for the Nova API service.
     value:
+      service_name: nova-api
       config_settings:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]

puppet/services/nova-base.yaml

@@ -31,6 +31,7 @@ outputs:
   role_data:
     description: Role data for the Neutron base service.
     value:
+      service_name: nova-base
       config_settings:
         nova::rabbit_password: {get_param: RabbitPassword}
         nova::rabbit_user: {get_param: RabbitUserName}

puppet/services/nova-compute.yaml

@@ -18,6 +18,7 @@ outputs:
   role_data:
     description: Role data for the Nova Compute service.
     value:
+      service_name: nova-compute
       config_settings:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]

puppet/services/nova-conductor.yaml

@@ -22,6 +22,7 @@ outputs:
   role_data:
     description: Role data for the Nova Conductor service.
     value:
+      service_name: nova-conductor
       config_settings:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]

puppet/services/nova-consoleauth.yaml

@@ -18,6 +18,7 @@ outputs:
   role_data:
     description: Role data for the Nova Consoleauth service.
     value:
+      service_name: nova-consoleauth
       config_settings:
         get_attr: [NovaBase, role_data, config_settings]
       step_config: |

puppet/services/nova-libvirt.yaml

@@ -18,6 +18,7 @@ outputs:
   role_data:
     description: Role data for the Libvirt service.
     value:
+      service_name: nova-libvirt
       config_settings:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]

puppet/services/nova-scheduler.yaml

@@ -18,6 +18,7 @@ outputs:
   role_data:
     description: Role data for the Nova Scheduler service.
     value:
+      service_name: nova-scheduler
       config_settings:
         map_merge:
           - get_attr: [NovaBase, role_data, config_settings]

puppet/services/nova-vncproxy.yaml

@@ -18,6 +18,7 @@ outputs:
   role_data:
     description: Role data for the Nova Vncproxy service.
     value:
+      service_name: nova-vncproxy
       config_settings:
         get_attr: [NovaBase, role_data, config_settings]
       step_config: |

puppet/services/pacemaker.yaml

@@ -14,6 +14,7 @@ outputs:
   role_data:
     description: Role data for the Pacemaker role.
     value:
+      service_name: pacemaker
       config_settings:
       step_config: |
         include ::tripleo::profile::base::pacemaker

puppet/services/pacemaker/ceilometer-agent-central.yaml

@@ -20,6 +20,7 @@ outputs:
   role_data:
     description: Role data for the Ceilometer Central Agent pacemaker role.
     value:
+      service_name: ceilometer-agent-central
       config_settings:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]

puppet/services/pacemaker/ceilometer-agent-notification.yaml

@@ -20,6 +20,7 @@ outputs:
   role_data:
     description: Role data for the Ceilometer Notification Agent pacemaker role.
     value:
+      service_name: ceilometer-agent-notification
       config_settings:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]

puppet/services/pacemaker/ceilometer-api.yaml

@@ -20,6 +20,7 @@ outputs:
   role_data:
     description: Role data for the Ceilometer API pacemaker role.
     value:
+      service_name: ceilometer-api
       config_settings:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]

puppet/services/pacemaker/ceilometer-collector.yaml

@@ -20,6 +20,7 @@ outputs:
   role_data:
     description: Role data for the Ceilometer Collector pacemaker role.
     value:
+      service_name: ceilometer-collector
       config_settings:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]

puppet/services/pacemaker/cinder-api.yaml

@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Cinder API role.
     value:
+      service_name: cinder-api
       config_settings:
         map_merge:
           - get_attr: [CinderApiBase, role_data, config_settings]

puppet/services/pacemaker/cinder-scheduler.yaml

@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Cinder Scheduler role.
     value:
+      service_name: cinder-scheduler
       config_settings:
         map_merge:
           - get_attr: [CinderSchedulerBase, role_data, config_settings]

puppet/services/pacemaker/cinder-volume.yaml

@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Cinder Volume role.
     value:
+      service_name: cinder-volume
       config_settings:
         map_merge:
           - get_attr: [CinderVolumeBase, role_data, config_settings]

puppet/services/pacemaker/database/mongodb.yaml

@@ -19,6 +19,7 @@ outputs:
   role_data:
     description: Service mongodb using composable services.
     value:
+      service_name: mongodb
       config_settings:
         map_merge:
           - get_attr: [MongoDbBase, role_data, config_settings]

puppet/services/pacemaker/database/mysql.yaml

@@ -15,6 +15,7 @@ outputs:
   role_data:
     description: Service MySQL with Pacemaker using composable services.
     value:
+      service_name: mysql
       config_settings:
       step_config: |
         include ::tripleo::profile::pacemaker::database::mysql

puppet/services/pacemaker/database/redis.yaml

@@ -18,6 +18,7 @@ outputs:
   role_data:
     description: Role data for the Redis pacemaker role.
     value:
+      service_name: redis
       config_settings:
         map_merge:
           - get_attr: [RedisBase, role_data, config_settings]

puppet/services/pacemaker/glance-api.yaml

@@ -45,6 +45,7 @@ outputs:
   role_data:
     description: Role data for the Glance role.
     value:
+      service_name: glance-api
       config_settings:
         map_merge:
           - get_attr: [GlanceApiBase, role_data, config_settings]

puppet/services/pacemaker/glance-registry.yaml

@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Glance role.
     value:
+      service_name: glance-registry
       config_settings:
         map_merge:
           - get_attr: [GlanceRegistryBase, role_data, config_settings]

puppet/services/pacemaker/gnocchi-api.yaml

@@ -20,6 +20,7 @@ outputs:
   role_data:
     description: Role data for the Gnocchi role.
     value:
+      service_name: gnocchi-api
       config_settings:
         map_merge:
           - get_attr: [GnocchiServiceBase, role_data, config_settings]

puppet/services/pacemaker/gnocchi-metricd.yaml

@@ -20,6 +20,7 @@ outputs:
   role_data:
     description: Role data for the Gnocchi role.
     value:
+      service_name: gnocchi-metricd
       config_settings:
         map_merge:
           - get_attr: [GnocchiServiceBase, role_data, config_settings]

puppet/services/pacemaker/gnocchi-statsd.yaml

@@ -20,6 +20,7 @@ outputs:
   role_data:
     description: Role data for the Gnocchi role.
     value:
+      service_name: gnocchi-statsd
       config_settings:
         map_merge:
           - get_attr: [GnocchiServiceBase, role_data, config_settings]

puppet/services/pacemaker/haproxy.yaml

@@ -20,6 +20,7 @@ outputs:
   role_data:
     description: Role data for the HAproxy with pacemaker role.
     value:
+      service_name: haproxy
       config_settings:
         map_merge:
           - get_attr: [LoadbalancerServiceBase, role_data, config_settings]

puppet/services/pacemaker/heat-api-cfn.yaml

@@ -20,6 +20,7 @@ outputs:
   role_data:
     description: Role data for the Heat CloudFormation API role.
     value:
+      service_name: heat-api-cfn
       config_settings:
         map_merge:
           - get_attr: [HeatApiCfnBase, role_data, config_settings]

puppet/services/pacemaker/heat-api-cloudwatch.yaml

@@ -20,6 +20,7 @@ outputs:
   role_data:
     description: Role data for the Heat Cloudwatch API role.
     value:
+      service_name: heat-api-cloudwatch
       config_settings:
         map_merge:
            - get_attr: [HeatApiCloudwatchBase, role_data, config_settings]

puppet/services/pacemaker/heat-api.yaml

@@ -20,6 +20,7 @@ outputs:
   role_data:
     description: Role data for the Heat API role.
     value:
+      service_name: heat-api
       config_settings:
         map_merge:
           - get_attr: [HeatApiBase, role_data, config_settings]

puppet/services/pacemaker/heat-engine.yaml

@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Heat engine role.
     value:
+      service_name: heat-engine
       config_settings:
         map_merge:
           - get_attr: [HeatEngineBase, role_data, config_settings]

puppet/services/pacemaker/horizon.yaml

@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Horizon role.
     value:
+      service_name: horizon
       config_settings:
         get_attr: [HorizonBase, role_data, config_settings]
       step_config: |

puppet/services/pacemaker/keystone.yaml

@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Keystone pacemaker role.
     value:
+      service_name: keystone
       config_settings:
         map_merge:
           - get_attr: [KeystoneServiceBase, role_data, config_settings]

puppet/services/pacemaker/memcached.yaml

@@ -19,6 +19,7 @@ outputs:
   role_data:
     description: Role data for the Memcached pacemaker role.
     value:
+      service_name: memcached
       config_settings:
         map_merge:
           - get_attr: [MemcachedServiceBase, role_data, config_settings]

puppet/services/pacemaker/neutron-dhcp.yaml

@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Neutron DHCP role.
     value:
+      service_name: neutron-dhcp
       config_settings:
         map_merge:
           - get_attr: [NeutronDhcpBase, role_data, config_settings]

puppet/services/pacemaker/neutron-l3.yaml

@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Neutron L3 role.
     value:
+      service_name: neutron-l3
       config_settings:
         map_merge:
           - get_attr: [NeutronL3Base, role_data, config_settings]

puppet/services/pacemaker/neutron-metadata.yaml

@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Metadata role.
     value:
+      service_name: neutron-metadata
       config_settings:
         map_merge:
           - get_attr: [NeutronMetadataBase, role_data, config_settings]

puppet/services/pacemaker/neutron-midonet.yaml

@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Midonet plugin.
     value:
+      service_name: neutron-midonet
       config_settings:
         map_merge:
           - get_attr: [NeutronMidonetBase, role_data, config_settings]

puppet/services/pacemaker/neutron-ovs-agent.yaml

@@ -19,6 +19,7 @@ outputs:
   role_data:
     description: Role data for the Neutron OVS agent service.
     value:
+      service_name: neutron-ovs-agent
       config_settings:
         get_attr: [NeutronOvsBase, role_data, config_settings]
       step_config: |

puppet/services/pacemaker/neutron-plugin-ml2.yaml

@@ -19,6 +19,7 @@ outputs:
   role_data:
     description: Role data for the Neutron ML2 plugin.
     value:
+      service_name: neutron-plugin-ml2
       config_settings:
         map_merge:
           - get_attr: [NeutronMl2Base, role_data, config_settings]

puppet/services/pacemaker/neutron-plugin-nuage.yaml

@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Nuage plugin.
     value:
+      service_name: neutron-plugin-nuage
       config_settings:
         map_merge:
           - get_attr: [NeutronPluginNuageBase, role_data, config_settings]