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 "Manage password_validator regex"
[apex-tripleo-heat-templates.git]
/
puppet
/
role.role.j2.yaml
diff --git
a/puppet/role.role.j2.yaml
b/puppet/role.role.j2.yaml
index
22370a7
..
2f070da
100644
(file)
--- a/
puppet/role.role.j2.yaml
+++ b/
puppet/role.role.j2.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2016-10-14
+heat_template_version:
ocata
description: 'OpenStack {{role}} node configured by Puppet'
parameters:
Overcloud{{role}}Flavor:
description: 'OpenStack {{role}} node configured by Puppet'
parameters:
Overcloud{{role}}Flavor:
@@
-359,8
+359,14
@@
resources:
- - {get_attr: [{{role}}, name]}
- ctlplane
- - {get_attr: [{{role}}, name]}
- ctlplane
+ PreNetworkConfig:
+ type: OS::TripleO::{{role}}::PreNetworkConfig
+ properties:
+ server: {get_resource: {{role}}}
+
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
+ depends_on: PreNetworkConfig
properties:
name: NetworkDeployment
config: {get_resource: NetworkConfig}
properties:
name: NetworkDeployment
config: {get_resource: NetworkConfig}