From: Robert Collins <rbtcollins@hp.com>
Date: Fri, 30 May 2014 19:57:00 +0000 (+1200)
Subject: Add custom public IP support to the undercloud.
X-Git-Tag: opnfv-6.0.0~2816^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b08bb1cf49e67ad1db966ebefefef0aa3a8d4a78;p=apex-tripleo-heat-templates.git

Add custom public IP support to the undercloud.

Now we're trying to automate VLAN deployed underclouds, this
suddenly becomes relevant.

Change-Id: I800a0ceab7443d685551d7a919724f6cf45fd891
---

diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 58e4eda8..22bb23e8 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -82,6 +82,18 @@ Parameters:
     Description: The password for the nova service account, used by nova-api.
     Type: String
     NoEcho: true
+  NeutronPublicInterfaceDefaultRoute:
+    Default: ''
+    Description: A custom default route for the NeutronPublicInterface.
+    Type: String
+  NeutronPublicInterfaceIP:
+    Default: ''
+    Description: A custom IP address to put onto the NeutronPublicInterface.
+    Type: String
+  NeutronPublicInterfaceRawDevice:
+    Default: ''
+    Description: If set, the public interface is a vlan with this device as the raw device.
+    Type: String
   NtpServer:
     Type: String
     Default: ''
@@ -140,6 +152,9 @@ Resources:
                       - undercloud
                       - show
           nodeid: {get_input: bootstack_nodeid}
+        bootstack:
+          public_interface_ip:
+            Ref: NeutronPublicInterfaceIP
         controller-address:
           get_input: controller_host
         ceilometer:
@@ -184,6 +199,10 @@ Resources:
           ovs:
             public_interface:
               Ref: NeutronPublicInterface
+            public_interface_raw_device:
+              Ref: NeutronPublicInterfaceRawDevice
+            public_interface_route:
+              Ref: NeutronPublicInterfaceDefaultRoute
             physical_bridge: br-ctlplane
             physical_network: ctlplane
             network_vlan_ranges: ctlplane