summaryrefslogtreecommitdiffstats
path: root/puppet/controller-puppet.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-21 19:24:28 +0000
committerGerrit Code Review <review@openstack.org>2015-09-21 19:24:28 +0000
commitbb03764bca90278e4e0b1cb0b07da6d0a458990d (patch)
tree5f716374bf309a1b0b3aeb81e9e55e4d0dce4d89 /puppet/controller-puppet.yaml
parent210ade81937dacd3eda9478d2806057ef7b1fead (diff)
parentbccb6989845893299a5e487c4f15b0c8066fddb0 (diff)
Merge "Configure ctlplane network with a static IP"
Diffstat (limited to 'puppet/controller-puppet.yaml')
-rw-r--r--puppet/controller-puppet.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index eb19b36d..084fe3d1 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -602,6 +602,7 @@ resources:
NetworkConfig:
type: OS::TripleO::Controller::Net::SoftwareConfig
properties:
+ ControlPlaneIp: {get_attr: [Controller, networks, ctlplane, 0]}
ExternalIpSubnet: {get_attr: [ExternalPort, ip_subnet]}
InternalApiIpSubnet: {get_attr: [InternalApiPort, ip_subnet]}
StorageIpSubnet: {get_attr: [StoragePort, ip_subnet]}