aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/controller.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-04 19:29:53 +0000
committerGerrit Code Review <review@openstack.org>2016-03-04 19:29:53 +0000
commit205ea09ca27caaeaddab27f3b021b398db195890 (patch)
tree3f55941926e1c582f137adecdcb99a181127bcfd /puppet/controller.yaml
parentac9a848b803874203b0d974a26405afd1e980076 (diff)
parent07e99fef9ba96dd9a650ef43560e6a7794939a20 (diff)
Merge "Allow for usage of pre-allocated IPs for the management network"
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r--puppet/controller.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 569ab5b2..688e4178 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -823,6 +823,8 @@ resources:
ManagementPort:
type: OS::TripleO::Controller::Ports::ManagementPort
properties:
+ IPPool: {get_param: ControllerIPs}
+ NodeIndex: {get_param: NodeIndex}
ControlPlaneIP: {get_attr: [Controller, networks, ctlplane, 0]}
NetIpMap: