From 6b30ff11d4e2eafda7a3ab693055c687d4a8da5d Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Tue, 19 Jul 2016 16:08:22 -0400 Subject: 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 | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'overcloud.yaml') 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 -- cgit 1.2.3-korg