summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDima Shulyak <dshulyak@mirantis.com>2014-04-22 15:52:43 +0300
committerDima Shulyak <dshulyak@mirantis.com>2014-05-09 11:07:31 +0300
commitd9d4143d153672e8a76529c1d313c8b08e0ef030 (patch)
tree07331e231ca36079d60a12274e5b4ac2a7acec65
parent5e5d633451474417217c4b2c87f6d817a98dd15b (diff)
Introduce configurable virtual ip in templates
added ControlVirtualIP resource of type OS::Neutron::Port Added ControlVirtualInterface - by default br-ex To specify the IP address to use as ControlVirtualIP, or for any others custom needs, you could provide: -P 'ControlFixedIPs=[{"ip_address" : "192.0.2.251"}]' Related to blueprint tripleo-icehouse-ha-production-configuration Change-Id: Ie82750ac1537c80311a869880f636bda59ca5c58
-rw-r--r--overcloud-source.yaml24
1 files changed, 24 insertions, 0 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 8dc5351d..4794f042 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -227,7 +227,22 @@ Parameters:
lower level default.
Type: Number
Default: 0
+ ControlVirtualInterface:
+ Default: 'br-ex'
+ Description: Interface where virtual ip will be assigned.
+ Type: String
+ ControlFixedIPs:
+ Default: []
+ Description: Should be used for arbitrary ips.
+ Type: Json
Resources:
+ ControlVirtualIP:
+ Type: OS::Neutron::Port
+ Properties:
+ name: control_virtual_ip
+ network_id: {Ref: NeutronControlPlaneID}
+ fixed_ips:
+ Ref: ControlFixedIPs
RabbitCookie:
Type: OS::Heat::RandomString
Properties:
@@ -433,6 +448,15 @@ Resources:
ntp:
servers:
- {server: {Ref: NtpServer}, fudge: "stratum 0"}
+ keepalived:
+ keepalive_interface:
+ Ref: NeutronPublicInterface
+ priority: 101
+ virtual_ips:
+ -
+ ip: {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]}
+ interface:
+ Ref: ControlVirtualInterface
controllerPassthrough:
Type: OS::Heat::StructuredConfig
Properties: