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

123 files changed, 185 insertions, 3 deletions

diff --git a/overcloud.yaml b/overcloud.yaml
index 4e00b971..503acf5d 100644
--- a/overcloud.yaml
+++ b/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
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index b2948144..77ca4dc6 100644
--- a/puppet/ceph-storage.yaml
+++ b/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:
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 05918026..edd81b9d 100644
--- a/puppet/cinder-storage.yaml
+++ b/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:
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index d4fdea3d..0e029162 100644
--- a/puppet/compute.yaml
+++ b/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:
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index ee4311d6..6519a1d9 100644
--- a/puppet/controller.yaml
+++ b/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:
diff --git a/puppet/services/ceilometer-agent-central.yaml b/puppet/services/ceilometer-agent-central.yaml
index 294e7dd2..34735f75 100644
--- a/puppet/services/ceilometer-agent-central.yaml
+++ b/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]
diff --git a/puppet/services/ceilometer-agent-compute.yaml b/puppet/services/ceilometer-agent-compute.yaml
index 737836af..9e4d0575 100644
--- a/puppet/services/ceilometer-agent-compute.yaml
+++ b/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: |
diff --git a/puppet/services/ceilometer-agent-notification.yaml b/puppet/services/ceilometer-agent-notification.yaml
index 523dabb9..b65e189b 100644
--- a/puppet/services/ceilometer-agent-notification.yaml
+++ b/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: |
diff --git a/puppet/services/ceilometer-api.yaml b/puppet/services/ceilometer-api.yaml
index 06c2ed12..5dce7c3d 100644
--- a/puppet/services/ceilometer-api.yaml
+++ b/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: |
diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml
index 1dea785f..0370da5b 100644
--- a/puppet/services/ceilometer-base.yaml
+++ b/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:
diff --git a/puppet/services/ceilometer-collector.yaml b/puppet/services/ceilometer-collector.yaml
index 29627210..540a4654 100644
--- a/puppet/services/ceilometer-collector.yaml
+++ b/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: |
diff --git a/puppet/services/ceilometer-expirer.yaml b/puppet/services/ceilometer-expirer.yaml
index 796abe1f..7816a859 100644
--- a/puppet/services/ceilometer-expirer.yaml
+++ b/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: |
diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml
index 065901b8..76f649b0 100644
--- a/puppet/services/ceph-base.yaml
+++ b/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}
diff --git a/puppet/services/ceph-client.yaml b/puppet/services/ceph-client.yaml
index ca920a5f..fc23f719 100644
--- a/puppet/services/ceph-client.yaml
+++ b/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: |
diff --git a/puppet/services/ceph-external.yaml b/puppet/services/ceph-external.yaml
index 4522f416..b656e245 100644
--- a/puppet/services/ceph-external.yaml
+++ b/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}
diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml
index d6e3aa70..68a59450 100644
--- a/puppet/services/ceph-mon.yaml
+++ b/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]
diff --git a/puppet/services/ceph-osd.yaml b/puppet/services/ceph-osd.yaml
index 24f60283..eaba271a 100644
--- a/puppet/services/ceph-osd.yaml
+++ b/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: |
diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml
index c53bef6f..0b4817ac 100644
--- a/puppet/services/cinder-api.yaml
+++ b/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]
diff --git a/puppet/services/cinder-base.yaml b/puppet/services/cinder-base.yaml
index f6d2b645..b6ffdec0 100644
--- a/puppet/services/cinder-base.yaml
+++ b/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:
diff --git a/puppet/services/cinder-scheduler.yaml b/puppet/services/cinder-scheduler.yaml
index 6bdf86bc..2e1e852d 100644
--- a/puppet/services/cinder-scheduler.yaml
+++ b/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: |
diff --git a/puppet/services/cinder-volume.yaml b/puppet/services/cinder-volume.yaml
index 41f3827d..69a38b04 100644
--- a/puppet/services/cinder-volume.yaml
+++ b/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]
diff --git a/puppet/services/database/mongodb-base.yaml b/puppet/services/database/mongodb-base.yaml
index ecd1d319..ed0b92af 100644
--- a/puppet/services/database/mongodb-base.yaml
+++ b/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}
diff --git a/puppet/services/database/mongodb.yaml b/puppet/services/database/mongodb.yaml
index c0488700..c2d36fc7 100644
--- a/puppet/services/database/mongodb.yaml
+++ b/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]
diff --git a/puppet/services/database/mysql.yaml b/puppet/services/database/mysql.yaml
index 3a23650b..992dc11e 100644
--- a/puppet/services/database/mysql.yaml
+++ b/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
diff --git a/puppet/services/database/redis-base.yaml b/puppet/services/database/redis-base.yaml
index 77b3c9f0..c7b083fa 100644
--- a/puppet/services/database/redis-base.yaml
+++ b/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}
diff --git a/puppet/services/database/redis.yaml b/puppet/services/database/redis.yaml
index 2669592a..080f72b6 100644
--- a/puppet/services/database/redis.yaml
+++ b/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]
diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml
index f1f98a8e..120c57ff 100644
--- a/puppet/services/glance-api.yaml
+++ b/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:
diff --git a/puppet/services/glance-registry.yaml b/puppet/services/glance-registry.yaml
index d71157f9..ea96fc52 100644
--- a/puppet/services/glance-registry.yaml
+++ b/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:
diff --git a/puppet/services/gnocchi-api.yaml b/puppet/services/gnocchi-api.yaml
index a7b203b2..f6877632 100644
--- a/puppet/services/gnocchi-api.yaml
+++ b/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]
diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml
index e49c440b..f69dfd03 100644
--- a/puppet/services/gnocchi-base.yaml
+++ b/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}
diff --git a/puppet/services/gnocchi-metricd.yaml b/puppet/services/gnocchi-metricd.yaml
index bafc8dd0..20215380 100644
--- a/puppet/services/gnocchi-metricd.yaml
+++ b/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]
diff --git a/puppet/services/gnocchi-statsd.yaml b/puppet/services/gnocchi-statsd.yaml
index 25abf490..4fef7af6 100644
--- a/puppet/services/gnocchi-statsd.yaml
+++ b/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]
diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml
index 844637bc..73b40003 100644
--- a/puppet/services/haproxy.yaml
+++ b/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
diff --git a/puppet/services/heat-api-cfn.yaml b/puppet/services/heat-api-cfn.yaml
index c1f26c15..8d237330 100644
--- a/puppet/services/heat-api-cfn.yaml
+++ b/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]
diff --git a/puppet/services/heat-api-cloudwatch.yaml b/puppet/services/heat-api-cloudwatch.yaml
index 2c56951b..c996cf13 100644
--- a/puppet/services/heat-api-cloudwatch.yaml
+++ b/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]
diff --git a/puppet/services/heat-api.yaml b/puppet/services/heat-api.yaml
index d3461e63..41c7d9a1 100644
--- a/puppet/services/heat-api.yaml
+++ b/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]
diff --git a/puppet/services/heat-base.yaml b/puppet/services/heat-base.yaml
index 88e27945..2a7aeabc 100644
--- a/puppet/services/heat-base.yaml
+++ b/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}
diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml
index 77af55ef..eb8534fc 100644
--- a/puppet/services/heat-engine.yaml
+++ b/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]
diff --git a/puppet/services/horizon.yaml b/puppet/services/horizon.yaml
index 01cf5791..022e3fbf 100644
--- a/puppet/services/horizon.yaml
+++ b/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:
diff --git a/puppet/services/ironic-api.yaml b/puppet/services/ironic-api.yaml
index 5ab03fcb..6f369f74 100644
--- a/puppet/services/ironic-api.yaml
+++ b/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]
diff --git a/puppet/services/ironic-base.yaml b/puppet/services/ironic-base.yaml
index df82bb6c..fb9d4dde 100644
--- a/puppet/services/ironic-base.yaml
+++ b/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:
diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml
index 26d4e0ed..574e5aef 100644
--- a/puppet/services/ironic-conductor.yaml
+++ b/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]
diff --git a/puppet/services/keepalived.yaml b/puppet/services/keepalived.yaml
index 09ce26b5..95a401c6 100644
--- a/puppet/services/keepalived.yaml
+++ b/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
diff --git a/puppet/services/kernel.yaml b/puppet/services/kernel.yaml
index b429c5ea..9e8a53f0 100644
--- a/puppet/services/kernel.yaml
+++ b/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
diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml
index 404ce6cd..83bab349 100644
--- a/puppet/services/keystone.yaml
+++ b/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:
diff --git a/puppet/services/memcached.yaml b/puppet/services/memcached.yaml
index fcd0adca..55f8c08e 100644
--- a/puppet/services/memcached.yaml
+++ b/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
diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml
index 8bd8d989..7143cd99 100644
--- a/puppet/services/neutron-base.yaml
+++ b/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}
diff --git a/puppet/services/neutron-compute-plugin-midonet.yaml b/puppet/services/neutron-compute-plugin-midonet.yaml
index c3b65c49..f08afd15 100644
--- a/puppet/services/neutron-compute-plugin-midonet.yaml
+++ b/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
diff --git a/puppet/services/neutron-compute-plugin-nuage.yaml b/puppet/services/neutron-compute-plugin-nuage.yaml
index c5fbeeca..f6e2f3a8 100644
--- a/puppet/services/neutron-compute-plugin-nuage.yaml
+++ b/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}
diff --git a/puppet/services/neutron-compute-plugin-opencontrail.yaml b/puppet/services/neutron-compute-plugin-opencontrail.yaml
index 2c79c56b..b95a6554 100644
--- a/puppet/services/neutron-compute-plugin-opencontrail.yaml
+++ b/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
diff --git a/puppet/services/neutron-compute-plugin-plumgrid.yaml b/puppet/services/neutron-compute-plugin-plumgrid.yaml
index b8ec389e..064ac9e0 100644
--- a/puppet/services/neutron-compute-plugin-plumgrid.yaml
+++ b/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
diff --git a/puppet/services/neutron-dhcp.yaml b/puppet/services/neutron-dhcp.yaml
index 5d02bc90..5b903eac 100644
--- a/puppet/services/neutron-dhcp.yaml
+++ b/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]
diff --git a/puppet/services/neutron-l3.yaml b/puppet/services/neutron-l3.yaml
index 20c82dc1..0e568614 100644
--- a/puppet/services/neutron-l3.yaml
+++ b/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]
diff --git a/puppet/services/neutron-metadata.yaml b/puppet/services/neutron-metadata.yaml
index e221b3a1..04c80e01 100644
--- a/puppet/services/neutron-metadata.yaml
+++ b/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]
diff --git a/puppet/services/neutron-midonet.yaml b/puppet/services/neutron-midonet.yaml
index 736c01c3..d48d97f0 100644
--- a/puppet/services/neutron-midonet.yaml
+++ b/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}
diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml
index 0e1dbb29..30caeec3 100644
--- a/puppet/services/neutron-ovs-agent.yaml
+++ b/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]
diff --git a/puppet/services/neutron-plugin-ml2.yaml b/puppet/services/neutron-plugin-ml2.yaml
index ff13d5d8..3511b2f2 100644
--- a/puppet/services/neutron-plugin-ml2.yaml
+++ b/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]
diff --git a/puppet/services/neutron-plugin-nuage.yaml b/puppet/services/neutron-plugin-nuage.yaml
index 3c3d8b63..3889f84a 100644
--- a/puppet/services/neutron-plugin-nuage.yaml
+++ b/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]
diff --git a/puppet/services/neutron-plugin-opencontrail.yaml b/puppet/services/neutron-plugin-opencontrail.yaml
index 9c58c03c..1d23c497 100644
--- a/puppet/services/neutron-plugin-opencontrail.yaml
+++ b/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]
diff --git a/puppet/services/neutron-plugin-plumgrid.yaml b/puppet/services/neutron-plugin-plumgrid.yaml
index a0ac46ef..484d163f 100644
--- a/puppet/services/neutron-plugin-plumgrid.yaml
+++ b/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:
diff --git a/puppet/services/neutron-server.yaml b/puppet/services/neutron-server.yaml
index d759d420..c9f6d680 100644
--- a/puppet/services/neutron-server.yaml
+++ b/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]
diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml
index 0ff159d2..69f63987 100644
--- a/puppet/services/nova-api.yaml
+++ b/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]
diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml
index 7de14f68..ddf39b6b 100644
--- a/puppet/services/nova-base.yaml
+++ b/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}
diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml
index 679586f7..ab6e2019 100644
--- a/puppet/services/nova-compute.yaml
+++ b/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]
diff --git a/puppet/services/nova-conductor.yaml b/puppet/services/nova-conductor.yaml
index 412dd275..6d186ab7 100644
--- a/puppet/services/nova-conductor.yaml
+++ b/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]
diff --git a/puppet/services/nova-consoleauth.yaml b/puppet/services/nova-consoleauth.yaml
index 791c5449..bc8a1e1d 100644
--- a/puppet/services/nova-consoleauth.yaml
+++ b/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: |
diff --git a/puppet/services/nova-libvirt.yaml b/puppet/services/nova-libvirt.yaml
index e3309c32..074755f9 100644
--- a/puppet/services/nova-libvirt.yaml
+++ b/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]
diff --git a/puppet/services/nova-scheduler.yaml b/puppet/services/nova-scheduler.yaml
index 65ed6643..17383201 100644
--- a/puppet/services/nova-scheduler.yaml
+++ b/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]
diff --git a/puppet/services/nova-vncproxy.yaml b/puppet/services/nova-vncproxy.yaml
index 93a25ab2..1bf157c7 100644
--- a/puppet/services/nova-vncproxy.yaml
+++ b/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: |
diff --git a/puppet/services/pacemaker.yaml b/puppet/services/pacemaker.yaml
index dc1d6e40..3b78befe 100644
--- a/puppet/services/pacemaker.yaml
+++ b/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
diff --git a/puppet/services/pacemaker/ceilometer-agent-central.yaml b/puppet/services/pacemaker/ceilometer-agent-central.yaml
index 8fb7bd23..3ba78fc2 100644
--- a/puppet/services/pacemaker/ceilometer-agent-central.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/ceilometer-agent-notification.yaml b/puppet/services/pacemaker/ceilometer-agent-notification.yaml
index 54709783..0fb008c4 100644
--- a/puppet/services/pacemaker/ceilometer-agent-notification.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/ceilometer-api.yaml b/puppet/services/pacemaker/ceilometer-api.yaml
index d45b1578..5cd8bb81 100644
--- a/puppet/services/pacemaker/ceilometer-api.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/ceilometer-collector.yaml b/puppet/services/pacemaker/ceilometer-collector.yaml
index 487a557c..9e3671e5 100644
--- a/puppet/services/pacemaker/ceilometer-collector.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/cinder-api.yaml b/puppet/services/pacemaker/cinder-api.yaml
index 0f66cc06..d1313b27 100644
--- a/puppet/services/pacemaker/cinder-api.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/cinder-scheduler.yaml b/puppet/services/pacemaker/cinder-scheduler.yaml
index d1472c00..c4e0a34f 100644
--- a/puppet/services/pacemaker/cinder-scheduler.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/cinder-volume.yaml b/puppet/services/pacemaker/cinder-volume.yaml
index ee4e6cea..3e28039e 100644
--- a/puppet/services/pacemaker/cinder-volume.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/database/mongodb.yaml b/puppet/services/pacemaker/database/mongodb.yaml
index b2e9e0bb..c09f93a9 100644
--- a/puppet/services/pacemaker/database/mongodb.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/database/mysql.yaml b/puppet/services/pacemaker/database/mysql.yaml
index 1cecbfae..cc9dc946 100644
--- a/puppet/services/pacemaker/database/mysql.yaml
+++ b/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
diff --git a/puppet/services/pacemaker/database/redis.yaml b/puppet/services/pacemaker/database/redis.yaml
index 0e46f8a3..0df62a37 100644
--- a/puppet/services/pacemaker/database/redis.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/glance-api.yaml b/puppet/services/pacemaker/glance-api.yaml
index 5a581dca..bc611b0a 100644
--- a/puppet/services/pacemaker/glance-api.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/glance-registry.yaml b/puppet/services/pacemaker/glance-registry.yaml
index 8b88cb93..72ca9393 100644
--- a/puppet/services/pacemaker/glance-registry.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/gnocchi-api.yaml b/puppet/services/pacemaker/gnocchi-api.yaml
index ac5355d9..6c01bc53 100644
--- a/puppet/services/pacemaker/gnocchi-api.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/gnocchi-metricd.yaml b/puppet/services/pacemaker/gnocchi-metricd.yaml
index 8a5562e6..4895bac6 100644
--- a/puppet/services/pacemaker/gnocchi-metricd.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/gnocchi-statsd.yaml b/puppet/services/pacemaker/gnocchi-statsd.yaml
index 8625b4e1..2760df37 100644
--- a/puppet/services/pacemaker/gnocchi-statsd.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/haproxy.yaml b/puppet/services/pacemaker/haproxy.yaml
index c2ca2816..811a6697 100644
--- a/puppet/services/pacemaker/haproxy.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/heat-api-cfn.yaml b/puppet/services/pacemaker/heat-api-cfn.yaml
index 780c295e..bf01ceda 100644
--- a/puppet/services/pacemaker/heat-api-cfn.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/heat-api-cloudwatch.yaml b/puppet/services/pacemaker/heat-api-cloudwatch.yaml
index 2fa82fe7..6ee844d3 100644
--- a/puppet/services/pacemaker/heat-api-cloudwatch.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/heat-api.yaml b/puppet/services/pacemaker/heat-api.yaml
index be897a55..14604428 100644
--- a/puppet/services/pacemaker/heat-api.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/heat-engine.yaml b/puppet/services/pacemaker/heat-engine.yaml
index a8ed5c0c..450917fd 100644
--- a/puppet/services/pacemaker/heat-engine.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/horizon.yaml b/puppet/services/pacemaker/horizon.yaml
index ea76896e..f8b5ad0c 100644
--- a/puppet/services/pacemaker/horizon.yaml
+++ b/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: |
diff --git a/puppet/services/pacemaker/keystone.yaml b/puppet/services/pacemaker/keystone.yaml
index 04e90368..f5f136d3 100644
--- a/puppet/services/pacemaker/keystone.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/memcached.yaml b/puppet/services/pacemaker/memcached.yaml
index 9a11855e..43cd528e 100644
--- a/puppet/services/pacemaker/memcached.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/neutron-dhcp.yaml b/puppet/services/pacemaker/neutron-dhcp.yaml
index 6f514379..312e275f 100644
--- a/puppet/services/pacemaker/neutron-dhcp.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/neutron-l3.yaml b/puppet/services/pacemaker/neutron-l3.yaml
index cb9c32d9..8607614b 100644
--- a/puppet/services/pacemaker/neutron-l3.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/neutron-metadata.yaml b/puppet/services/pacemaker/neutron-metadata.yaml
index 1c74b26f..96f3fb4b 100644
--- a/puppet/services/pacemaker/neutron-metadata.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/neutron-midonet.yaml b/puppet/services/pacemaker/neutron-midonet.yaml
index f9fd992c..3c185da9 100644
--- a/puppet/services/pacemaker/neutron-midonet.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/neutron-ovs-agent.yaml b/puppet/services/pacemaker/neutron-ovs-agent.yaml
index a17d7a61..214dc1c0 100644
--- a/puppet/services/pacemaker/neutron-ovs-agent.yaml
+++ b/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: |
diff --git a/puppet/services/pacemaker/neutron-plugin-ml2.yaml b/puppet/services/pacemaker/neutron-plugin-ml2.yaml
index 9091b5b9..a4c4a5e4 100644
--- a/puppet/services/pacemaker/neutron-plugin-ml2.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/neutron-plugin-nuage.yaml b/puppet/services/pacemaker/neutron-plugin-nuage.yaml
index 704d922a..64ad0f42 100644
--- a/puppet/services/pacemaker/neutron-plugin-nuage.yaml
+++ b/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]
diff --git a/puppet/services/pacemaker/neutron-plugin-opencontrail.yaml b/puppet/services/pacemaker/neutron-plugin-opencontrail.yaml
index d8c75509..f2fd5b92 100644
--- a/puppet/services/pacemaker/neutron-plugin-opencontrail.yaml
+++ b/puppet/services/pacemaker/neutron-plugin-opencontrail.yaml
@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Neutron OpenContrail plugin.
     value:
+      service_name: neutron-plugin-opencontrail
       config_settings:
         map_merge:
           - get_attr: [NeutronPluginOpenContrail, role_data, config_settings]
diff --git a/puppet/services/pacemaker/neutron-plugin-plumgrid.yaml b/puppet/services/pacemaker/neutron-plugin-plumgrid.yaml
index c2e8eaac..9ceaf004 100644
--- a/puppet/services/pacemaker/neutron-plugin-plumgrid.yaml
+++ b/puppet/services/pacemaker/neutron-plugin-plumgrid.yaml
@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Neutron PLUMgrid plugin.
     value:
+      service_name: neutron-plugin-plumgrid
       config_settings:
         map_merge:
           - get_attr: [NeutronPluginPlumgridBase, role_data, config_settings]
diff --git a/puppet/services/pacemaker/neutron-server.yaml b/puppet/services/pacemaker/neutron-server.yaml
index 60599e7e..7234c1d9 100644
--- a/puppet/services/pacemaker/neutron-server.yaml
+++ b/puppet/services/pacemaker/neutron-server.yaml
@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Server.
     value:
+      service_name: neutron-server
       config_settings:
         map_merge:
           - get_attr: [NeutronServerBase, role_data, config_settings]
diff --git a/puppet/services/pacemaker/nova-api.yaml b/puppet/services/pacemaker/nova-api.yaml
index 1b5011b6..467955fa 100644
--- a/puppet/services/pacemaker/nova-api.yaml
+++ b/puppet/services/pacemaker/nova-api.yaml
@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Nova API role.
     value:
+      service_name: nova-api
       config_settings:
         map_merge:
           - get_attr: [NovaApiBase, role_data, config_settings]
diff --git a/puppet/services/pacemaker/nova-conductor.yaml b/puppet/services/pacemaker/nova-conductor.yaml
index a484f0df..fe0b00f3 100644
--- a/puppet/services/pacemaker/nova-conductor.yaml
+++ b/puppet/services/pacemaker/nova-conductor.yaml
@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Nova Conductor role.
     value:
+      service_name: nova-conductor
       config_settings:
         map_merge:
           - get_attr: [NovaConductorBase, role_data, config_settings]
diff --git a/puppet/services/pacemaker/nova-consoleauth.yaml b/puppet/services/pacemaker/nova-consoleauth.yaml
index f9b6b058..cc683eb5 100644
--- a/puppet/services/pacemaker/nova-consoleauth.yaml
+++ b/puppet/services/pacemaker/nova-consoleauth.yaml
@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Nova Consoleauth role.
     value:
+      service_name: nova-consoleauth
       config_settings:
         map_merge:
           - get_attr: [NovaConsoleauthBase, role_data, config_settings]
diff --git a/puppet/services/pacemaker/nova-scheduler.yaml b/puppet/services/pacemaker/nova-scheduler.yaml
index 0032cbe6..dbb643c5 100644
--- a/puppet/services/pacemaker/nova-scheduler.yaml
+++ b/puppet/services/pacemaker/nova-scheduler.yaml
@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Nova Scheduler role.
     value:
+      service_name: nova-scheduler
       config_settings:
         map_merge:
           - get_attr: [NovaSchedulerBase, role_data, config_settings]
diff --git a/puppet/services/pacemaker/nova-vncproxy.yaml b/puppet/services/pacemaker/nova-vncproxy.yaml
index 52395240..8fb07d57 100644
--- a/puppet/services/pacemaker/nova-vncproxy.yaml
+++ b/puppet/services/pacemaker/nova-vncproxy.yaml
@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Nova Vncproxy role.
     value:
+      service_name: nova-vncproxy
       config_settings:
         map_merge:
           - get_attr: [NovaVncproxyBase, role_data, config_settings]
diff --git a/puppet/services/pacemaker/rabbitmq.yaml b/puppet/services/pacemaker/rabbitmq.yaml
index 20fb2e40..b01caeea 100644
--- a/puppet/services/pacemaker/rabbitmq.yaml
+++ b/puppet/services/pacemaker/rabbitmq.yaml
@@ -20,6 +20,7 @@ outputs:
   role_data:
     description: Role data for the RabbitMQ pacemaker role.
     value:
+      service_name: rabbitmq
       config_settings:
         map_merge:
           - get_attr: [RabbitMQServiceBase, role_data, config_settings]
diff --git a/puppet/services/pacemaker/sahara-api.yaml b/puppet/services/pacemaker/sahara-api.yaml
index a5db77c4..a4dfa137 100644
--- a/puppet/services/pacemaker/sahara-api.yaml
+++ b/puppet/services/pacemaker/sahara-api.yaml
@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Sahara API role.
     value:
+      service_name: sahara-api
       config_settings:
         map_merge:
           - get_attr: [SaharaApiBase, role_data, config_settings]
diff --git a/puppet/services/pacemaker/sahara-engine.yaml b/puppet/services/pacemaker/sahara-engine.yaml
index 129f88bf..31d9bea5 100644
--- a/puppet/services/pacemaker/sahara-engine.yaml
+++ b/puppet/services/pacemaker/sahara-engine.yaml
@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role data for the Sahara Engine role.
     value:
+      service_name: sahara-engine
       config_settings:
         map_merge:
           - get_attr: [SaharaEngineBase, role_data, config_settings]
diff --git a/puppet/services/rabbitmq.yaml b/puppet/services/rabbitmq.yaml
index 3688c4a8..7b4b10ef 100644
--- a/puppet/services/rabbitmq.yaml
+++ b/puppet/services/rabbitmq.yaml
@@ -30,6 +30,7 @@ outputs:
   role_data:
     description: Role data for the RabbitMQ role.
     value:
+      service_name: rabbitmq
       config_settings:
         rabbitmq::file_limit: {get_param: RabbitFDLimit}
         rabbitmq::default_user: {get_param: RabbitUserName}
diff --git a/puppet/services/sahara-api.yaml b/puppet/services/sahara-api.yaml
index 93bf7385..a0a98b17 100644
--- a/puppet/services/sahara-api.yaml
+++ b/puppet/services/sahara-api.yaml
@@ -34,6 +34,7 @@ outputs:
   role_data:
     description: Role data for the Sahara API role.
     value:
+      service_name: sahara-api
       config_settings:
         map_merge:
           - get_attr: [SaharaBase, role_data, config_settings]
diff --git a/puppet/services/sahara-base.yaml b/puppet/services/sahara-base.yaml
index 275d7536..72fc33a3 100644
--- a/puppet/services/sahara-base.yaml
+++ b/puppet/services/sahara-base.yaml
@@ -31,6 +31,7 @@ outputs:
   role_data:
     description: Role data for the Sahara base service.
     value:
+      service_name: sahara-base
       config_settings:
         sahara::rabbit_password: {get_param: RabbitPassword}
         sahara::rabbit_user: {get_param: RabbitUserName}
diff --git a/puppet/services/sahara-engine.yaml b/puppet/services/sahara-engine.yaml
index f0411a35..4cd93257 100644
--- a/puppet/services/sahara-engine.yaml
+++ b/puppet/services/sahara-engine.yaml
@@ -23,6 +23,7 @@ outputs:
   role_data:
     description: Role data for the Sahara Engine role.
     value:
+      service_name: sahara-engine
       config_settings:
         map_merge:
           - get_attr: [SaharaBase, role_data, config_settings]
diff --git a/puppet/services/services.yaml b/puppet/services/services.yaml
index 91f0e049..64a0f985 100644
--- a/puppet/services/services.yaml
+++ b/puppet/services/services.yaml
@@ -30,5 +30,6 @@ outputs:
   role_data:
     description: Combined Role data for this set of services.
     value:
+      service_names: {get_attr: [ServiceChain, role_data, service_name]}
       config_settings: {map_merge: {get_attr: [ServiceChain, role_data, config_settings]}}
       step_config: {list_join: ["\n", {get_attr: [ServiceChain, role_data, step_config]}]}
diff --git a/puppet/services/snmp.yaml b/puppet/services/snmp.yaml
index 24ee2933..36e510b9 100644
--- a/puppet/services/snmp.yaml
+++ b/puppet/services/snmp.yaml
@@ -24,6 +24,7 @@ outputs:
   role_data:
     description: Role data for the SNMP services
     value:
+      service_name: snmp
       config_settings:
         snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
         snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml
index 930b9e3d..3ae1b01e 100644
--- a/puppet/services/swift-proxy.yaml
+++ b/puppet/services/swift-proxy.yaml
@@ -35,6 +35,7 @@ outputs:
   role_data:
     description: Role data for the Swift proxy service.
     value:
+      service_name: swift-proxy
       config_settings:
         # Swift
         swift::proxy::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
diff --git a/puppet/services/swift-storage.yaml b/puppet/services/swift-storage.yaml
index 980c95f5..02746a95 100644
--- a/puppet/services/swift-storage.yaml
+++ b/puppet/services/swift-storage.yaml
@@ -36,6 +36,7 @@ outputs:
   role_data:
     description: Role data for the Swift Proxy role.
     value:
+      service_name: swift-storage
       config_settings:
         # Swift
         swift::storage::all::mount_check: {get_param: SwiftMountCheck}
diff --git a/puppet/services/time/ntp.yaml b/puppet/services/time/ntp.yaml
index 930dca41..a0e51fec 100644
--- a/puppet/services/time/ntp.yaml
+++ b/puppet/services/time/ntp.yaml
@@ -21,6 +21,7 @@ outputs:
   role_data:
     description: Role ntp using composable services.
     value:
+      service_name: ntp
       config_settings:
         ntp::ntpservers: {get_param: NtpServer}
       step_config: |
diff --git a/puppet/services/time/timezone.yaml b/puppet/services/time/timezone.yaml
index 13fda986..805c9050 100644
--- a/puppet/services/time/timezone.yaml
+++ b/puppet/services/time/timezone.yaml
@@ -18,6 +18,7 @@ outputs:
   role_data:
     description: Timezone role using composable services.
     value:
+      service_name: timezone
       config_settings:
         timezone::timezone: {get_param: TimeZone}
       step_config: |
diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index 9d049bd3..7b41c72b 100644
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -112,6 +112,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
@@ -255,6 +258,7 @@ resources:
             - heat_config_%{::deploy_config_name}
             - object_extraconfig
             - extraconfig
+            - service_names
             - service_configs
             - object
             - swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig
@@ -264,6 +268,9 @@ resources:
             - network
           merge_behavior: deeper
           datafiles:
+            service_names:
+              mapped_data:
+                service_names: {get_param: ServiceNames}
             service_configs:
               mapped_data: {get_param: ServiceConfigSettings}
             common:
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index 2da873d0..34219eff 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -21,23 +21,49 @@ def exit_usage():
     print('Usage %s <yaml file or directory>' % sys.argv[0])
     sys.exit(1)
 
+
+def validate_service(filename, tpl):
+    if 'outputs' in tpl and 'role_data' in tpl['outputs']:
+        if 'value' not in tpl['outputs']['role_data']:
+            print('ERROR: invalid role_data for filename: %s'
+                  % filename)
+            return 1
+        role_data = tpl['outputs']['role_data']['value']
+        if 'service_name' not in role_data:
+            print('ERROR: service_name is required in role_data for %s.'
+                  % filename)
+            return 1
+        if (role_data['service_name'] !=
+                os.path.basename(filename).split('.')[0]):
+            print('ERROR: service_name should match file name for service: %s.'
+                  % filename)
+            return 1
+    return 0
+
+
 def validate(filename):
     print('Validating %s' % filename)
+    retval = 0
     try:
         tpl = yaml.load(open(filename).read())
+
+        if (filename.startswith('./puppet/services/') and
+                filename != './puppet/services/services.yaml'):
+            retval = validate_service(filename, tpl)
+
     except Exception:
         print(traceback.format_exc())
         return 1
     # yaml is OK, now walk the parameters and output a warning for unused ones
     for p in tpl.get('parameters', {}):
         str_p = '\'%s\'' % p
-        in_resources =  str_p in str(tpl.get('resources', {}))
-        in_outputs =  str_p in str(tpl.get('outputs', {}))
+        in_resources = str_p in str(tpl.get('resources', {}))
+        in_outputs = str_p in str(tpl.get('outputs', {}))
         if not in_resources and not in_outputs:
             print('Warning: parameter %s in template %s appears to be unused'
                   % (p, filename))
 
-    return 0
+    return retval
 
 if len(sys.argv) < 2:
     exit_usage()