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 -net=host for docker-puppet.py config gen"
[apex-tripleo-heat-templates.git]
/
deployed-server
/
deployed-server.yaml
diff --git
a/deployed-server/deployed-server.yaml
b/deployed-server/deployed-server.yaml
index
1e8afb2
..
afdb5d0
100644
(file)
--- a/
deployed-server/deployed-server.yaml
+++ b/
deployed-server/deployed-server.yaml
@@
-81,6
+81,7
@@
resources:
InstanceIdDeployment:
type: OS::Heat::StructuredDeployment
properties:
InstanceIdDeployment:
type: OS::Heat::StructuredDeployment
properties:
+ name: InstanceIdDeployment
config: {get_resource: InstanceIdConfig}
server: {get_resource: deployed-server}
depends_on: UpgradeInitDeployment
config: {get_resource: InstanceIdConfig}
server: {get_resource: deployed-server}
depends_on: UpgradeInitDeployment
@@
-103,6
+104,7
@@
resources:
HostsEntryDeployment:
type: OS::Heat::SoftwareDeployment
properties:
HostsEntryDeployment:
type: OS::Heat::SoftwareDeployment
properties:
+ name: HostsEntryDeployment
config: {get_resource: HostsEntryConfig}
server: {get_resource: deployed-server}
config: {get_resource: HostsEntryConfig}
server: {get_resource: deployed-server}