diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-05-27 08:49:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-05-27 08:49:36 +0000 |
| commit | 7cd061a8565a068ea29e001a47dd8fbd2a4bce61 (patch) | |
| tree | 39f88a6aa5023a467cd5a40198efd85cedd1251b /puppet/ceph-storage.yaml | |
| parent | 894453f46e30c45a500bdeeeccc27ac5f1fc362b (diff) | |
| parent | ddd2eb9f13b5df416a0f7794b952763bf597cbff (diff) | |
Merge "Configure CephStorage services via resource chains"
Diffstat (limited to 'puppet/ceph-storage.yaml')
| -rw-r--r-- | puppet/ceph-storage.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
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: |