From ddd2eb9f13b5df416a0f7794b952763bf597cbff Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Wed, 25 May 2016 17:58:50 +0200
Subject: Configure CephStorage services via resource chains

Also wires in the steps into the CephStorage role.

Change-Id: Ib472f1279478ad7792349cc32bb3c5f510ba69fe
---
 puppet/ceph-storage.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'puppet/ceph-storage.yaml')

diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index d2b90c59..eedb35e4 100644
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -96,6 +96,9 @@ parameters:
   NodeIndex:
     type: number
     default: 0
+  ServiceConfigSettings:
+    type: json
+    default: {}
 
 resources:
   CephStorage:
@@ -247,6 +250,7 @@ resources:
             - heat_config_%{::deploy_config_name}
             - ceph_extraconfig
             - extraconfig
+            - service_configs
             - ceph_cluster # provided by CephClusterConfig
             - ceph
             - '"%{::osfamily}"'
@@ -254,6 +258,8 @@ resources:
             - network
           merge_behavior: deeper
           datafiles:
+            service_configs:
+              mapped_data: {get_param: ServiceConfigSettings}
             common:
               raw_data: {get_file: hieradata/common.yaml}
             network:
-- 
cgit 1.2.3-korg