diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-15 13:05:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-15 13:05:28 +0000 |
| commit | cea62f129cadbee58480765b3f9b6b0894ca418f (patch) | |
| tree | 5e162d3129cd188fd7fd7e4212b94a425f843064 /puppet/controller-role.yaml | |
| parent | 24d552ae33adfbbbeb7a1b51b2fe09263c8e9a95 (diff) | |
| parent | 0c66118b10c6988a5287edd9082a6ef577fc4f56 (diff) | |
Merge "Modify PreNetworkConfig config inline with role-specific parameters"
Diffstat (limited to 'puppet/controller-role.yaml')
| -rw-r--r-- | puppet/controller-role.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml index 396eda8d..6bc23669 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 |