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 "Remove the ControllerCount contraint"
[apex-tripleo-heat-templates.git]
/
puppet
/
compute-post.yaml
diff --git
a/puppet/compute-post.yaml
b/puppet/compute-post.yaml
index
2033c4b
..
c1b3777
100644
(file)
--- a/
puppet/compute-post.yaml
+++ b/
puppet/compute-post.yaml
@@
-10,12
+10,12
@@
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
RoleData:
type: json
default: {}
RoleData:
type: json
default: {}
+ DeployIdentifier:
+ type: string
+ description: Value which changes if the node configuration may need to be re-applied
resources:
resources:
@@
-28,7
+28,7
@@
resources:
servers: {get_param: servers}
config: {get_resource: ComputeArtifactsConfig}
input_values:
servers: {get_param: servers}
config: {get_resource: ComputeArtifactsConfig}
input_values:
- update_identifier: {get_param:
NodeConfigIdentifiers
}
+ update_identifier: {get_param:
DeployIdentifier
}
ComputePuppetConfig:
type: OS::Heat::SoftwareConfig
ComputePuppetConfig:
type: OS::Heat::SoftwareConfig
@@
-57,7
+57,7
@@
resources:
config: {get_resource: ComputePuppetConfig}
input_values:
step: 2
config: {get_resource: ComputePuppetConfig}
input_values:
step: 2
- update_identifier: {get_param:
NodeConfigIdentifiers
}
+ update_identifier: {get_param:
DeployIdentifier
}
ComputeOvercloudServicesDeployment_Step3:
type: OS::Heat::StructuredDeployments
ComputeOvercloudServicesDeployment_Step3:
type: OS::Heat::StructuredDeployments
@@
-68,7
+68,7
@@
resources:
config: {get_resource: ComputePuppetConfig}
input_values:
step: 3
config: {get_resource: ComputePuppetConfig}
input_values:
step: 3
- update_identifier: {get_param:
NodeConfigIdentifiers
}
+ update_identifier: {get_param:
DeployIdentifier
}
ComputeOvercloudServicesDeployment_Step4:
type: OS::Heat::StructuredDeployments
ComputeOvercloudServicesDeployment_Step4:
type: OS::Heat::StructuredDeployments
@@
-79,7
+79,7
@@
resources:
config: {get_resource: ComputePuppetConfig}
input_values:
step: 4
config: {get_resource: ComputePuppetConfig}
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.