Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Use MysqlVirtualIPUri for nova_api and sahara database"
[apex-tripleo-heat-templates.git]
/
puppet
/
cinder-storage-post.yaml
diff --git
a/puppet/cinder-storage-post.yaml
b/puppet/cinder-storage-post.yaml
index
960cc5b
..
f470203
100644
(file)
--- a/
puppet/cinder-storage-post.yaml
+++ b/
puppet/cinder-storage-post.yaml
@@
-1,26
+1,53
@@
-heat_template_version: 2014-10-16
-description: 'Common Block Storage Post Deployment'
-# NOTE: this is a noop for os-apply-config style deployments because
-# post deployment ordering is controlled by tripleo-image-elements
+heat_template_version: 2015-04-30
+description: 'OpenStack cinder storage post deployment for Puppet'
parameters:
parameters:
+ ConfigDebug:
+ default: false
+ description: Whether to run config management (e.g. Puppet) in debug mode.
+ type: boolean
servers:
type: json
servers:
type: json
+ NodeConfigIdentifiers:
+ type: json
+ description: Value which changes if the node configuration may need to be re-applied
resources:
resources:
+ VolumeArtifactsConfig:
+ type: deploy-artifacts.yaml
+
+ VolumeArtifactsDeploy:
+ type: OS::Heat::StructuredDeployments
+ properties:
+ servers: {get_param: servers}
+ config: {get_resource: VolumeArtifactsConfig}
+ input_values:
+ update_identifier: {get_param: NodeConfigIdentifiers}
+
VolumePuppetConfig:
type: OS::Heat::SoftwareConfig
VolumePuppetConfig:
type: OS::Heat::SoftwareConfig
+ depends_on: VolumeArtifactsDeploy
properties:
group: puppet
properties:
group: puppet
+ options:
+ enable_debug: {get_param: ConfigDebug}
outputs:
- name: result
config:
get_file: manifests/overcloud_volume.pp
outputs:
- name: result
config:
get_file: manifests/overcloud_volume.pp
- Volume
PuppetDeployment
:
+ Volume
Deployment_Step1
:
type: OS::Heat::StructuredDeployments
properties:
type: OS::Heat::StructuredDeployments
properties:
- name:
puppet_
1
+ name:
VolumeDeployment_Step
1
servers: {get_param: servers}
config: {get_resource: VolumePuppetConfig}
servers: {get_param: servers}
config: {get_resource: VolumePuppetConfig}
+
+ # Note, this should come last, so use depends_on to ensure
+ # this is created after any other resources.
+ ExtraConfig:
+ depends_on: VolumeDeployment_Step1
+ type: OS::TripleO::NodeExtraConfigPost
+ properties:
+ servers: {get_param: servers}