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 "Add keystone networks for the different endpoints"
[apex-tripleo-heat-templates.git]
/
puppet
/
swift-storage-post.yaml
diff --git
a/puppet/swift-storage-post.yaml
b/puppet/swift-storage-post.yaml
index
1aba2bb
..
ebc54ab
100644
(file)
--- a/
puppet/swift-storage-post.yaml
+++ b/
puppet/swift-storage-post.yaml
@@
-8,13
+8,13
@@
parameters:
type: boolean
servers:
type: json
type: boolean
servers:
type: json
-
NodeConfigIdentifiers
:
-
type: json
- description: Value which changes if the node configuration may need to be re-applied
-
StepConfig
:
+
RoleData
:
+ type: json
+ default: {}
+
DeployIdentifier
:
type: string
type: string
- description: Config manifests that will be used to step through the deployment.
default: ''
default: ''
+ description: Value which changes if the node configuration may need to be re-applied
resources:
resources:
@@
-27,7
+27,7
@@
resources:
servers: {get_param: servers}
config: {get_resource: StorageArtifactsConfig}
input_values:
servers: {get_param: servers}
config: {get_resource: StorageArtifactsConfig}
input_values:
- update_identifier: {get_param:
NodeConfigIdentifiers
}
+ update_identifier: {get_param:
DeployIdentifier
}
StoragePuppetConfig:
type: OS::Heat::SoftwareConfig
StoragePuppetConfig:
type: OS::Heat::SoftwareConfig
@@
-37,6
+37,7
@@
resources:
enable_debug: {get_param: ConfigDebug}
enable_hiera: True
enable_facter: False
enable_debug: {get_param: ConfigDebug}
enable_hiera: True
enable_facter: False
+ modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules
inputs:
- name: step
outputs:
inputs:
- name: step
outputs:
@@
-45,8
+46,7
@@
resources:
list_join:
- ''
- - get_file: manifests/overcloud_object.pp
list_join:
- ''
- - get_file: manifests/overcloud_object.pp
- - get_file: manifests/ringbuilder.pp
- - {get_param: StepConfig}
+ - {get_param: [RoleData, step_config]}
StorageRingbuilderDeployment_Step2:
type: OS::Heat::StructuredDeployments
StorageRingbuilderDeployment_Step2:
type: OS::Heat::StructuredDeployments
@@
-57,7
+57,7
@@
resources:
config: {get_resource: StoragePuppetConfig}
input_values:
step: 2
config: {get_resource: StoragePuppetConfig}
input_values:
step: 2
- update_identifier: {get_param:
NodeConfigIdentifiers
}
+ update_identifier: {get_param:
DeployIdentifier
}
StorageRingbuilderDeployment_Step3:
type: OS::Heat::StructuredDeployments
StorageRingbuilderDeployment_Step3:
type: OS::Heat::StructuredDeployments
@@
-68,7
+68,7
@@
resources:
config: {get_resource: StoragePuppetConfig}
input_values:
step: 3
config: {get_resource: StoragePuppetConfig}
input_values:
step: 3
- update_identifier: {get_param:
NodeConfigIdentifiers
}
+ update_identifier: {get_param:
DeployIdentifier
}
StorageDeployment_Step4:
type: OS::Heat::StructuredDeployments
StorageDeployment_Step4:
type: OS::Heat::StructuredDeployments
@@
-79,7
+79,7
@@
resources:
config: {get_resource: StoragePuppetConfig}
input_values:
step: 4
config: {get_resource: StoragePuppetConfig}
input_values:
step: 4
- update_identifier: {get_param:
NodeConfigIdentifiers
}
+ update_identifier: {get_param:
DeployIdentifier
}
# Note, this should come last, so use depends_on to ensure
# this is created after any other resources.
# Note, this should come last, so use depends_on to ensure
# this is created after any other resources.