aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/ceph-storage-post.yaml
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-05-25 17:58:50 +0200
committerGiulio Fidente <gfidente@redhat.com>2016-05-26 17:50:49 +0200
commitddd2eb9f13b5df416a0f7794b952763bf597cbff (patch)
treeb6601d8f67c8d8959db3cececc53c1c1b97b6e4d /puppet/ceph-storage-post.yaml
parente1d3c42ae970b615c7da138f5b18c8137cbc2f5d (diff)
Configure CephStorage services via resource chains
Also wires in the steps into the CephStorage role. Change-Id: Ib472f1279478ad7792349cc32bb3c5f510ba69fe
Diffstat (limited to 'puppet/ceph-storage-post.yaml')
-rw-r--r--puppet/ceph-storage-post.yaml32
1 files changed, 27 insertions, 5 deletions
diff --git a/puppet/ceph-storage-post.yaml b/puppet/ceph-storage-post.yaml
index e90710c..2b9ae75 100644
--- a/puppet/ceph-storage-post.yaml
+++ b/puppet/ceph-storage-post.yaml
@@ -13,6 +13,10 @@ parameters:
NodeConfigIdentifiers:
type: json
description: Value which changes if the node configuration may need to be re-applied
+ StepConfig:
+ type: string
+ description: Config manifests that will be used to step through the deployment.
+ default: ''
resources:
@@ -33,26 +37,44 @@ resources:
group: puppet
options:
enable_debug: {get_param: ConfigDebug}
+ enable_hiera: True
+ enable_facter: False
+ inputs:
+ - name: step
outputs:
- name: result
config:
- get_file: manifests/overcloud_cephstorage.pp
+ list_join:
+ - ''
+ - - get_file: manifests/overcloud_cephstorage.pp
+ - {get_param: StepConfig}
- CephStorageDeployment_Step1:
+ CephStorageDeployment_Step2:
type: OS::Heat::StructuredDeployments
depends_on: CephStorageArtifactsDeploy
properties:
- name: CephStorageDeployment_Step1
+ name: CephStorageDeployment_Step2
servers: {get_param: servers}
config: {get_resource: CephStoragePuppetConfig}
input_values:
+ step: 2
+ update_identifier: {get_param: NodeConfigIdentifiers}
+
+ CephStorageDeployment_Step3:
+ type: OS::Heat::StructuredDeployments
+ depends_on: CephStorageDeployment_Step2
+ properties:
+ name: CephStorageDeployment_Step3
+ servers: {get_param: servers}
+ config: {get_resource: CephStoragePuppetConfig}
+ input_values:
+ step: 3
update_identifier: {get_param: NodeConfigIdentifiers}
# Note, this should come last, so use depends_on to ensure
# this is created after any other resources.
ExtraConfig:
- depends_on: CephStorageDeployment_Step1
+ depends_on: CephStorageDeployment_Step3
type: OS::TripleO::NodeExtraConfigPost
properties:
servers: {get_param: servers}
-