Merge "Composable roles within services - Redis"

3 files changed, 74 insertions, 0 deletions

diff --git a/puppet/services/database/redis-base.yaml b/puppet/services/database/redis-base.yaml
new file mode 100644
index 00000000..77b3c9f0
--- /dev/null
+++ b/puppet/services/database/redis-base.yaml
@@ -0,0 +1,21 @@
+heat_template_version: 2016-04-08
+
+description: >
+  OpenStack Redis service configured with Puppet
+
+parameters:
+  RedisPassword:
+    description: The password for Redis
+    type: string
+    hidden: true
+
+outputs:
+  role_data:
+    description: Role data for the redis role.
+    value:
+      config_settings:
+       redis::requirepass: {get_param: RedisPassword}
+       redis::masterauth: {get_param: RedisPassword}
+       redis::sentinel_auth_pass: {get_param: RedisPassword}
+       tripleo::loadbalancer::redis_password: {get_param: RedisPassword}
+
diff --git a/puppet/services/database/redis.yaml b/puppet/services/database/redis.yaml
new file mode 100644
index 00000000..2669592a
--- /dev/null
+++ b/puppet/services/database/redis.yaml
@@ -0,0 +1,25 @@
+heat_template_version: 2016-04-08
+
+description: >
+  OpenStack Redis service configured with Puppet
+
+parameters:
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+
+resources:
+  RedisBase:
+    type: ./redis-base.yaml
+
+outputs:
+  role_data:
+    description: Role data for the redis role.
+    value:
+      config_settings:
+        map_merge:
+          - get_attr: [RedisBase, role_data, config_settings]
+      step_config: |
+        include ::tripleo::profile::base::database::redis
diff --git a/puppet/services/pacemaker/database/redis.yaml b/puppet/services/pacemaker/database/redis.yaml
new file mode 100644
index 00000000..0e46f8a3
--- /dev/null
+++ b/puppet/services/pacemaker/database/redis.yaml
@@ -0,0 +1,28 @@
+heat_template_version: 2016-04-08
+
+description: >
+  OpenStack Redis service configured with Puppet
+
+parameters:
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+
+resources:
+  RedisBase:
+    type: ../../database/redis-base.yaml
+
+outputs:
+  role_data:
+    description: Role data for the Redis pacemaker role.
+    value:
+      config_settings:
+        map_merge:
+          - get_attr: [RedisBase, role_data, config_settings]
+          - tripleo::profile::pacemaker::database::redis::redis_vip: {get_input: redis_vip}
+            redis::service_manage: false
+            redis::notify_service: false
+      step_config: |
+        include ::tripleo::profile::pacemaker::database::redis