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 "Customize "supported_pci_vendor_devs" for SR-IOV"
[apex-tripleo-heat-templates.git]
/
docker
/
compute-post.yaml
diff --git
a/docker/compute-post.yaml
b/docker/compute-post.yaml
index
3c4a941
..
60b831b
100644
(file)
--- a/
docker/compute-post.yaml
+++ b/
docker/compute-post.yaml
@@
-5,8
+5,8
@@
description: >
parameters:
servers:
type: json
parameters:
servers:
type: json
-
NodeConfigIdentifiers
:
- type:
json
+
DeployIdentifier
:
+ type:
string
description: Value which changes if the node configuration may need to be re-applied
DockerNamespace:
type: string
description: Value which changes if the node configuration may need to be re-applied
DockerNamespace:
type: string
@@
-38,6
+38,14
@@
parameters:
NeutronOpenvswitchAgentOvsVolume:
type: string
default: " "
NeutronOpenvswitchAgentOvsVolume:
type: string
default: " "
+ StepConfig:
+ type: string
+ description: Config manifests that will be used to step through the deployment.
+ default: ''
+ RoleData:
+ type: json
+ default: {}
+
resources:
resources:
@@
-56,7
+64,11
@@
resources:
outputs:
- name: result
config:
outputs:
- name: result
config:
- get_file: ../puppet/manifests/overcloud_compute.pp
+ list_join:
+ - ''
+ - - get_file: ../puppet/manifests/overcloud_compute.pp
+ - {get_param: StepConfig}
+
ComputePuppetDeployment:
type: OS::Heat::SoftwareDeployments
ComputePuppetDeployment:
type: OS::Heat::SoftwareDeployments
@@
-65,7
+77,7
@@
resources:
servers: {get_param: servers}
config: {get_resource: ComputePuppetConfig}
input_values:
servers: {get_param: servers}
config: {get_resource: ComputePuppetConfig}
input_values:
- update_identifier: {get_param:
NodeConfigIdentifiers
}
+ update_identifier: {get_param:
DeployIdentifier
}
tripleo::packages::enable_install: True
CopyEtcConfig:
tripleo::packages::enable_install: True
CopyEtcConfig: