From 6b30ff11d4e2eafda7a3ab693055c687d4a8da5d Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
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
---
 puppet/services/database/mongodb-base.yaml | 1 +
 puppet/services/database/mongodb.yaml      | 1 +
 puppet/services/database/mysql.yaml        | 1 +
 puppet/services/database/redis-base.yaml   | 1 +
 puppet/services/database/redis.yaml        | 1 +
 5 files changed, 5 insertions(+)

(limited to 'puppet/services/database')

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]
-- 
cgit 1.2.3-korg