summaryrefslogtreecommitdiffstats
path: root/heat
diff options
context:
space:
mode:
authorLusheng Ji <lji@research.att.com>2017-10-15 20:16:44 -0400
committerLusheng Ji <lji@research.att.com>2017-10-16 02:41:49 +0000
commitf79590758d6cce11b10d9257af798c8f8bc10f1e (patch)
tree708127efce9e1da738d8d3d0d867be85bedcabb9 /heat
parent2c932329f5477040bc2c37b83d4e7d9f7e080137 (diff)
Update dcae2 vm_init and intsall scripts
Issue-Id: DCAEGEN2-127 Change-Id: I4e8221972144495d9f121e4f5cfc775d141b15cb Signed-off-by: Lusheng Ji <lji@research.att.com>
Diffstat (limited to 'heat')
-rw-r--r--heat/ONAP/onap_openstack.yaml18
1 files changed, 16 insertions, 2 deletions
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index e8e44a0c..242d0dd2 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -1710,6 +1710,12 @@ resources:
__flavor_medium__: { get_param: flavor_medium }
__mac_addr__: { get_attr: [dcae_c_private_port, mac_address] }
__rand_str__: { get_resource: random-str }
+ __mr_ip_addr__: { get_param: mr_ip_addr }
+ #__mr_float_ip__: { get_attr: [mr_floating_ip, floating_ip_address] }
+ __policy_ip_addr__: { get_param: policy_ip_addr }
+ #__policy_float_ip__: { get_attr: [policy_floating_ip, floating_ip_address] }
+ __sdc_ip_addr__: { get_param: sdc_ip_addr }
+ #__sdc_float_ip__: { get_attr: [sdc_floating_ip, floating_ip_address] }
template: |
#!/bin/bash
@@ -1726,6 +1732,7 @@ resources:
echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
echo "__dcae_zone__" > /opt/config/dcae_zone.txt
echo "__tenant_id__" > /opt/config/tenant_id.txt
+ echo "__tenant_id__" > /opt/config/tenant_name.txt
echo "__openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt
echo "__openstack_user__" > /opt/config/openstack_user.txt
echo "__openstack_password__" > /opt/config/openstack_password.txt
@@ -1742,13 +1749,20 @@ resources:
echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt
echo "__centos_7_image__" > /opt/config/centos_7_image.txt
echo "__security_group__" > /opt/config/security_group.txt
- echo "__flavor_medium__" > /opt/config/flavor_medium.txt
+ echo "__flavor_medium__" > /opt/config/flavor_id.txt
echo "__dcae_repo__" > /opt/config/remote_repo.txt
echo "__mac_addr__" > /opt/config/mac_addr.txt
echo "__rand_str__" > /opt/config/rand_str.txt
+ echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
+ echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
+ echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
+ #echo "__mr_floating_ip_addr__" > /opt/config/mr_floating_ip_addr.txt
+ #echo "__policy_floating_ip_addr__" > /opt/config/policy_floating_ip_addr.txt
+ #echo "__sdc_floating_ip_addr__" > /opt/config/sdc_floating_ip_addr.txt
+
# Download and run install script
curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae2_install.sh -o /opt/dcae2_install.sh
cd /opt
chmod +x dcae2_install.sh
- ./dcae2_install.sh \ No newline at end of file
+ ./dcae2_install.sh