diff options
| -rw-r--r-- | boot/dcae_install.sh | 14 | ||||
| -rw-r--r-- | heat/OpenECOMP/onap_openstack.yaml | 12 | ||||
| -rw-r--r-- | heat/OpenECOMP/onap_openstack_float.yaml | 12 | ||||
| -rw-r--r-- | heat/OpenECOMP/onap_openstack_nofloat.yaml | 12 |
4 files changed, 50 insertions, 0 deletions
diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh index c8b4002d..45e74379 100644 --- a/boot/dcae_install.sh +++ b/boot/dcae_install.sh @@ -38,6 +38,13 @@ DCAE_HDP1_IP_ADDR=$(cat /opt/config/dcae_hdp1_ip_addr.txt) DCAE_HDP2_IP_ADDR=$(cat /opt/config/dcae_hdp2_ip_addr.txt) DCAE_HDP3_IP_ADDR=$(cat /opt/config/dcae_hdp3_ip_addr.txt) +UBUNTU_1404_IMAGE=$(cat /opt/config/ubuntu_1404_image.txt) +UBUNTU_1604_IMAGE=$(cat /opt/config/ubuntu_1604_image.txt) +FLAVOR_SMALL=$(cat /opt/config/flavor_small.txt) +FLAVOR_MEDIUM=$(cat /opt/config/flavor_medium.txt) +FLAVOR_LARGE=$(cat /opt/config/flavor_large.txt) +FLAVOR_XLARGE=$(cat /opt/config/flavor_xlarge.txt) + if [[ $CLOUD_ENV != "rackspace" ]] then # Add host name to /etc/host to avoid warnings in openstack images @@ -154,6 +161,13 @@ dcae_coll00_ip_addr: $DCAE_COLL_IP_ADDR dcae_cdap00_ip_addr: $DCAE_HDP1_IP_ADDR dcae_cdap01_ip_addr: $DCAE_HDP2_IP_ADDR dcae_cdap02_ip_addr: $DCAE_HDP3_IP_ADDR + +UBUNTU-1404-IMAGE: $UBUNTU_1404_IMAGE +UBUNTU-1604-IMAGE: $UBUNTU_1604_IMAGE +FLAVOR-SMALL: $FLAVOR_SMALL +FLAVOR-MEDIUM: $FLAVOR_MEDIUM +FLAVOR-LARGE: $FLAVOR_LARGE +FLAVOR-XLARGE: $FLAVOR_XLARGE EOF_CONFIG # Add floating IP section to DCAE config file for OpenStack deployments that use floating IPs diff --git a/heat/OpenECOMP/onap_openstack.yaml b/heat/OpenECOMP/onap_openstack.yaml index 63981821..335cdba6 100644 --- a/heat/OpenECOMP/onap_openstack.yaml +++ b/heat/OpenECOMP/onap_openstack.yaml @@ -984,6 +984,12 @@ resources: __dcae_hdp2_ip_addr__: { get_param: dcae_hdp2_ip_addr } __dcae_hdp3_ip_addr__: { get_param: dcae_hdp3_ip_addr } __external_dns__: { get_param: external_dns } + __ubuntu_1404_image__: { get_param: ubuntu_1404_image } + __ubuntu_1604_image__: { get_param: ubuntu_1604_image } + __flavor_small__: { get_param: flavor_small } + __flavor_medium__: { get_param: flavor_medium } + __flavor_large__: { get_param: flavor_large } + __flavor_xlarge__: { get_param: flavor_xlarge } template: | #!/bin/bash @@ -1024,6 +1030,12 @@ resources: 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 "__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 + echo "__flavor_small__" > /opt/config/flavor_small.txt + echo "__flavor_medium__" > /opt/config/flavor_medium.txt + echo "__flavor_large__" > /opt/config/flavor_large.txt + echo "__flavor_xlarge__" > /opt/config/flavor_xlarge.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dcae_install.sh -o /opt/dcae_install.sh diff --git a/heat/OpenECOMP/onap_openstack_float.yaml b/heat/OpenECOMP/onap_openstack_float.yaml index 47001a8b..897e2a10 100644 --- a/heat/OpenECOMP/onap_openstack_float.yaml +++ b/heat/OpenECOMP/onap_openstack_float.yaml @@ -1069,6 +1069,12 @@ resources: __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 } + __flavor_small__: { get_param: flavor_small } + __flavor_medium__: { get_param: flavor_medium } + __flavor_large__: { get_param: flavor_large } + __flavor_xlarge__: { get_param: flavor_xlarge } template: | #!/bin/bash @@ -1115,6 +1121,12 @@ resources: 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 + echo "__flavor_small__" > /opt/config/flavor_small.txt + echo "__flavor_medium__" > /opt/config/flavor_medium.txt + echo "__flavor_large__" > /opt/config/flavor_large.txt + echo "__flavor_xlarge__" > /opt/config/flavor_xlarge.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dcae_install.sh -o /opt/dcae_install.sh diff --git a/heat/OpenECOMP/onap_openstack_nofloat.yaml b/heat/OpenECOMP/onap_openstack_nofloat.yaml index c21ba288..2a54b833 100644 --- a/heat/OpenECOMP/onap_openstack_nofloat.yaml +++ b/heat/OpenECOMP/onap_openstack_nofloat.yaml @@ -950,6 +950,12 @@ resources: __dcae_hdp2_ip_addr__: { get_param: dcae_hdp2_ip_addr } __dcae_hdp3_ip_addr__: { get_param: dcae_hdp3_ip_addr } __external_dns__: { get_param: external_dns } + __ubuntu_1404_image__: { get_param: ubuntu_1404_image } + __ubuntu_1604_image__: { get_param: ubuntu_1604_image } + __flavor_small__: { get_param: flavor_small } + __flavor_medium__: { get_param: flavor_medium } + __flavor_large__: { get_param: flavor_large } + __flavor_xlarge__: { get_param: flavor_xlarge } template: | #!/bin/bash @@ -991,6 +997,12 @@ resources: 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 "__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 + echo "__flavor_small__" > /opt/config/flavor_small.txt + echo "__flavor_medium__" > /opt/config/flavor_medium.txt + echo "__flavor_large__" > /opt/config/flavor_large.txt + echo "__flavor_xlarge__" > /opt/config/flavor_xlarge.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dcae_install.sh -o /opt/dcae_install.sh |