From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Mon, 12 Jun 2017 05:46:16 +0000 (+0530)
Subject: Add specific router external gateway ip
X-Git-Tag: 1.0.0-Amsterdam~263
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=965de48062400cb2afbbb7c34024b90f8d032e14;p=demo.git

Add specific router external gateway ip

ECOMP HOT YAML is designed to assign the public
IP for every component and router external public
gateway IP is picking randomly, which is causing
IP conflict sometimes. so HOT template is
updated to assign the static public IP for
router public external gateway IP.

Change-Id: If6e8567584cd86d9260c76ebc989d205566e1c78
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
---

diff --git a/heat/OpenECOMP/onap_openstack_float.env b/heat/OpenECOMP/onap_openstack_float.env
index aed3a4bd..4c2fbeed 100644
--- a/heat/OpenECOMP/onap_openstack_float.env
+++ b/heat/OpenECOMP/onap_openstack_float.env
@@ -8,6 +8,10 @@ parameters:
 
   public_net_id: PUT YOUR NETWORK ID/NAME HERE
 
+  public_subnet_id: PUT PUBLIC SUBNET ID HERE
+
+  router_gateway_ip: PUT ROUTER GATEWAY PUBLIC IP HERE
+
   ubuntu_1404_image: PUT THE UBUNTU 14.04 IMAGE NAME HERE
 
   ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE
diff --git a/heat/OpenECOMP/onap_openstack_float.yaml b/heat/OpenECOMP/onap_openstack_float.yaml
index 02feac7a..eff4cc8e 100644
--- a/heat/OpenECOMP/onap_openstack_float.yaml
+++ b/heat/OpenECOMP/onap_openstack_float.yaml
@@ -39,11 +39,19 @@ parameters:
   # Parameters used across all ONAP components #
   #                                            #
   ##############################################
-  
+
   public_net_id:
     type: string
     description: Public network for floating IP address allocation
 
+  public_subnet_id:
+    type: string
+    description: Public network subnet id
+
+  router_gateway_ip:
+    type: string
+    description: Public network gateway IP address
+
   ubuntu_1404_image:
     type: string
     description: Name of the Ubuntu 14.04 image
@@ -399,6 +407,9 @@ resources:
     properties:
       external_gateway_info:
         network: { get_param: public_net_id }
+        external_fixed_ips:
+          - ip_address: { get_param: router_gateway_ip }
+            subnet: { get_param: public_subnet_id }
 
   router_interface:
     type: OS::Neutron::RouterInterface