aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2016-02-11 10:57:54 +0000
committerGiulio Fidente <gfidente@redhat.com>2016-03-04 14:26:55 +0100
commit07e99fef9ba96dd9a650ef43560e6a7794939a20 (patch)
treef670f5ce0290c7fc78b54a3d13d18d52741d8b8a /puppet
parent6be32543479589dedcae7502e6fe2167efeda710 (diff)
Allow for usage of pre-allocated IPs for the management network
Id3d4f12235501ae77200430a2dc022f378dce336 added support for pre-allocated IPs on the other overlay networks, but because the patch adding the managment network (I0813a13f60a4f797be04b34258a2cffa9ea7e84f) was under review around the same time, we missed adding the from_pool capability to the ManagementNetwork. Change-Id: If99f37634d5da7e7fb7cfc31232e926bd5ff074a
Diffstat (limited to 'puppet')
-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: