aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHector Anapan-Lavalle <ha076r@att.com>2017-07-14 20:02:05 +0000
committerGerrit Code Review <gerrit@onap.org>2017-07-14 20:02:05 +0000
commit1a92cb5c28ba17b4a57e4c02ad7223119c810c4a (patch)
tree534bc133541d6a4c3c7817cee4cda53dd02c4ba1
parent07c7f8770a0474174cefe10e6d883013ad294c77 (diff)
parent84aa8dec226fd24a48250da98826ad8e65529a17 (diff)
Merge "Add floating IPs to DCAE VMs"
-rw-r--r--heat/OpenECOMP/onap_openstack.env6
-rw-r--r--heat/OpenECOMP/onap_openstack.yaml31
2 files changed, 37 insertions, 0 deletions
diff --git a/heat/OpenECOMP/onap_openstack.env b/heat/OpenECOMP/onap_openstack.env
index ae25cba0..6ac4e006 100644
--- a/heat/OpenECOMP/onap_openstack.env
+++ b/heat/OpenECOMP/onap_openstack.env
@@ -90,6 +90,12 @@ parameters:
sdnc_ip_addr: 10.0.7.1
vid_ip_addr: 10.0.8.1
+ dcae_coll_float_ip: PUT DCAE COLLECTOR FLOATING IP HERE
+ dcae_db_float_ip: PUT DCAE DATABASE FLOATING IP HERE
+ dcae_hdp1_float_ip: PUT DCAE HADOOP VM1 FLOATING IP HERE
+ dcae_hdp2_float_ip: PUT DCAE HADOOP VM2 FLOATING IP HERE
+ dcae_hdp3_float_ip: PUT DCAE HADOOP VM3 FLOATING IP HERE
+
###########################
# #
# Parameters used by DCAE #
diff --git a/heat/OpenECOMP/onap_openstack.yaml b/heat/OpenECOMP/onap_openstack.yaml
index 3929db9f..a17a0eeb 100644
--- a/heat/OpenECOMP/onap_openstack.yaml
+++ b/heat/OpenECOMP/onap_openstack.yaml
@@ -232,6 +232,25 @@ parameters:
type: string
description: VID IP Address
+ dcae_coll_float_ip:
+ type: string
+ description: DCAE Collector Floating IP Address
+
+ dcae_db_float_ip:
+ type: string
+ description: DCAE Collector Database Floating IP Address
+
+ dcae_hdp1_float_ip:
+ type: string
+ description: Hadoop VM1 Floating IP Address
+
+ dcae_hdp2_float_ip:
+ type: string
+ description: Hadoop VM2 Floating IP Address
+
+ dcae_hdp3_float_ip:
+ type: string
+ description: Hadoop VM3 Floating IP Address
###########################
# #
@@ -1111,6 +1130,12 @@ resources:
__dcae_hdp1_ip_addr__: { get_param: dcae_hdp1_ip_addr }
__dcae_hdp2_ip_addr__: { get_param: dcae_hdp2_ip_addr }
__dcae_hdp3_ip_addr__: { get_param: dcae_hdp3_ip_addr }
+ __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
+ __dcae_coll_float_ip__: { get_param: dcae_coll_float_ip }
+ __dcae_db_float_ip__: { get_param: dcae_db_float_ip }
+ __dcae_hdp1_float_ip__: { get_param: dcae_hdp1_float_ip }
+ __dcae_hdp2_float_ip__: { get_param: dcae_hdp2_float_ip }
+ __dcae_hdp3_float_ip__: { get_param: dcae_hdp3_float_ip }
__external_dns__: { get_param: external_dns }
__ubuntu_1404_image__: { get_param: ubuntu_1404_image }
__ubuntu_1604_image__: { get_param: ubuntu_1604_image }
@@ -1157,6 +1182,12 @@ resources:
echo "__dcae_hdp1_ip_addr__" > /opt/config/dcae_hdp1_ip_addr.txt
echo "__dcae_hdp2_ip_addr__" > /opt/config/dcae_hdp2_ip_addr.txt
echo "__dcae_hdp3_ip_addr__" > /opt/config/dcae_hdp3_ip_addr.txt
+ echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt
+ echo "__dcae_coll_float_ip__" > /opt/config/dcae_coll_float_ip.txt
+ echo "__dcae_db_float_ip__" > /opt/config/dcae_db_float_ip.txt
+ echo "__dcae_hdp1_float_ip__" > /opt/config/dcae_hdp1_float_ip.txt
+ echo "__dcae_hdp2_float_ip__" > /opt/config/dcae_hdp2_float_ip.txt
+ echo "__dcae_hdp3_float_ip__" > /opt/config/dcae_hdp3_float_ip.txt
echo "__external_dns__" > /opt/config/external_dns.txt
echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt
echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt