aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/role.role.j2.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-15 13:05:27 +0000
committerGerrit Code Review <review@openstack.org>2017-06-15 13:05:28 +0000
commitcea62f129cadbee58480765b3f9b6b0894ca418f (patch)
tree5e162d3129cd188fd7fd7e4212b94a425f843064 /puppet/role.role.j2.yaml
parent24d552ae33adfbbbeb7a1b51b2fe09263c8e9a95 (diff)
parent0c66118b10c6988a5287edd9082a6ef577fc4f56 (diff)
Merge "Modify PreNetworkConfig config inline with role-specific parameters"
Diffstat (limited to 'puppet/role.role.j2.yaml')
-rw-r--r--puppet/role.role.j2.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 409b0a33..b7f47594 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -161,6 +161,10 @@ parameters:
Map of server hostnames to blacklist from any triggered
deployments. If the value is 1, the server will be blacklisted. This
parameter is generated from the parent template.
+ RoleParameters:
+ type: json
+ description: Role Specific Parameters
+ default: {}
conditions:
server_not_blacklisted:
@@ -394,6 +398,7 @@ resources:
type: OS::TripleO::{{role}}::PreNetworkConfig
properties:
server: {get_resource: {{role}}}
+ RoleParameters: {get_param: RoleParameters}
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment