aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller-role.yaml
diff options
context:
space:
mode:
authorSaravanan KR <skramaja@redhat.com>2017-03-17 21:45:54 +0530
committerSaravanan KR <skramaja@redhat.com>2017-06-13 11:02:33 +0530
commit0c66118b10c6988a5287edd9082a6ef577fc4f56 (patch)
tree54ce813ea5d32eeccdc075aeed7a11bf1b430e75 /puppet/controller-role.yaml
parent9a319d42b6c5092d1863e7018afee3eb42b9d6ed (diff)
Modify PreNetworkConfig config inline with role-specific parameters
Existing host_config_and_reboot.role.j2.yaml is done in ocata to configure kernel args. This can be enhanced with use of role-specific parameters, which is done in the current patch. The earlier method is deprecated and will be removed in Q releae. Implements: blueprint ovs-2-6-dpdk Change-Id: Ib864f065527167a49a0f60812d7ad4ad12c836d1
Diffstat (limited to 'puppet/controller-role.yaml')
-rw-r--r--puppet/controller-role.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml
index cccfdef1..0f51dfcf 100644
--- a/puppet/controller-role.yaml
+++ b/puppet/controller-role.yaml
@@ -171,6 +171,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: {}
parameter_groups:
- label: deprecated
@@ -401,6 +405,7 @@ resources:
type: OS::TripleO::Controller::PreNetworkConfig
properties:
server: {get_resource: Controller}
+ RoleParameters: {get_param: RoleParameters}
NetworkConfig:
type: OS::TripleO::Controller::Net::SoftwareConfig