From: Marco Platania <platania@research.att.com>
Date: Fri, 4 May 2018 13:23:13 +0000 (+0000)
Subject: Merge "Sync up env template with env file changes"
X-Git-Tag: v1.2.0~25
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3d94013ab5f93ec2d47afb5c1faab53bdbf3064e;hp=405dfedeb11aa1c313ed696c01279c178575d30a;p=demo.git

Merge "Sync up env template with env file changes"
---

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 27fdca50..ddc5dd0e 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -1039,6 +1039,9 @@ resources:
             __policy_ip_addr__: { get_param: policy_ip_addr }
             __portal_ip_addr__: { get_param: portal_ip_addr }
             __sdc_ip_addr__: { get_param: sdc_ip_addr }
+            __sdc_fe_ip_addr__: { get_param: sdc_ip_addr }
+            __sdc_be_ip_addr__: { get_param: sdc_ip_addr }
+            __sdc_be_onboard_ip_addr__: { get_param: sdc_ip_addr }
             __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
             __vid_ip_addr__: { get_param: vid_ip_addr }
             __clamp_ip_addr__: { get_param: clamp_ip_addr }
@@ -1084,8 +1087,9 @@ resources:
             echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
             echo "__portal_ip_addr__" > /opt/config/cli_ip_addr.txt
             echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
-            echo "__sdc_ip_addr__" > /opt/config/sdc_be_ip_addr.txt
-            echo "__sdc_ip_addr__" > /opt/config/sdc_fe_ip_addr.txt
+            echo "__sdc_fe_ip_addr__" > /opt/config/sdc_fe_ip_addr.txt
+            echo "__sdc_be_ip_addr__" > /opt/config/sdc_be_ip_addr.txt
+            echo "__sdc_be_onboard_ip_addr__" > /opt/config/sdc_be_onboard_ip_addr.txt
             echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
             echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
             echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt
diff --git a/heat/ONAP/onap_openstack_light.yaml b/heat/ONAP/onap_openstack_light.yaml
index 4df12aac..6ad957ee 100644
--- a/heat/ONAP/onap_openstack_light.yaml
+++ b/heat/ONAP/onap_openstack_light.yaml
@@ -957,6 +957,9 @@ resources:
             __policy_ip_addr__: { get_param: policy_ip_addr }
             __portal_ip_addr__: { get_param: portal_ip_addr }
             __sdc_ip_addr__: { get_param: sdc_ip_addr }
+            __sdc_fe_ip_addr__: { get_param: sdc_ip_addr }
+            __sdc_be_ip_addr__: { get_param: sdc_ip_addr }
+            __sdc_be_onboard_ip_addr__: { get_param: sdc_ip_addr }
             __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
             __vid_ip_addr__: { get_param: vid_ip_addr }
             __clamp_ip_addr__: { get_param: clamp_ip_addr }
@@ -1001,8 +1004,9 @@ resources:
             echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
             echo "__portal_ip_addr__" > /opt/config/cli_ip_addr.txt
             echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
-            echo "__sdc_ip_addr__" > /opt/config/sdc_be_ip_addr.txt
-            echo "__sdc_ip_addr__" > /opt/config/sdc_fe_ip_addr.txt
+            echo "__sdc_fe_ip_addr__" > /opt/config/sdc_fe_ip_addr.txt
+            echo "__sdc_be_ip_addr__" > /opt/config/sdc_be_ip_addr.txt
+            echo "__sdc_be_onboard_ip_addr__" > /opt/config/sdc_be_onboard_ip_addr.txt
             echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
             echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
             echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt