From 6c850ae66f515d6990d2d94e02a5bc7be17d3a9f Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Wed, 16 Aug 2017 09:25:40 -0400 Subject: Add AAI searchservice entry to DNS configuration - Add the searchservice entry to DNS zone file - Rename aai2_* install/init scripts to aai_* - Point Heat template to aai_* scripts Change-Id: Ife73688cdc2cf01dc9aa89d8b91db79eea6ea15b Issue-ID: AAI-128 Signed-off-by: Marco Platania --- heat/ONAP/onap_openstack.yaml | 12 ++++++------ heat/ONAP/onap_openstack_float.yaml | 12 ++++++------ heat/ONAP/onap_openstack_nofloat.yaml | 12 ++++++------ heat/ONAP/onap_rackspace.yaml | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'heat') diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 48339997..c3409de5 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -495,10 +495,10 @@ resources: echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai2_install.sh -o /opt/aai2_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh cd /opt - chmod +x aai2_install.sh - ./aai2_install.sh + chmod +x aai_install.sh + ./aai_install.sh aai2_private_port: @@ -560,10 +560,10 @@ resources: echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai2_install.sh -o /opt/aai2_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh cd /opt - chmod +x aai2_install.sh - ./aai2_install.sh + chmod +x aai_install.sh + ./aai_install.sh # MSO instantiation diff --git a/heat/ONAP/onap_openstack_float.yaml b/heat/ONAP/onap_openstack_float.yaml index af49a776..7116abc2 100644 --- a/heat/ONAP/onap_openstack_float.yaml +++ b/heat/ONAP/onap_openstack_float.yaml @@ -562,10 +562,10 @@ resources: echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai2_install.sh -o /opt/aai2_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh cd /opt - chmod +x aai2_install.sh - ./aai2_install.sh + chmod +x aai_install.sh + ./aai_install.sh aai2_private_port: @@ -628,10 +628,10 @@ resources: echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai2_install.sh -o /opt/aai2_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh cd /opt - chmod +x aai2_install.sh - ./aai2_install.sh + chmod +x aai_install.sh + ./aai_install.sh # MSO instantiation diff --git a/heat/ONAP/onap_openstack_nofloat.yaml b/heat/ONAP/onap_openstack_nofloat.yaml index b505d725..900cb376 100644 --- a/heat/ONAP/onap_openstack_nofloat.yaml +++ b/heat/ONAP/onap_openstack_nofloat.yaml @@ -453,10 +453,10 @@ resources: echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai2_install.sh -o /opt/aai2_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh cd /opt - chmod +x aai2_install.sh - ./aai2_install.sh + chmod +x aai_install.sh + ./aai_install.sh aai2_private_port: @@ -517,10 +517,10 @@ resources: echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai2_install.sh -o /opt/aai2_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh cd /opt - chmod +x aai2_install.sh - ./aai2_install.sh + chmod +x aai_install.sh + ./aai_install.sh # MSO instantiation diff --git a/heat/ONAP/onap_rackspace.yaml b/heat/ONAP/onap_rackspace.yaml index f62043a2..1283dd10 100644 --- a/heat/ONAP/onap_rackspace.yaml +++ b/heat/ONAP/onap_rackspace.yaml @@ -309,10 +309,10 @@ resources: echo "__cloud_env__" > /opt/config/cloud_env.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai2_install.sh -o /opt/aai2_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh cd /opt - chmod +x aai2_install.sh - ./aai2_install.sh + chmod +x aai_install.sh + ./aai_install.sh aai2_private_port: @@ -376,10 +376,10 @@ resources: echo "__cloud_env__" > /opt/config/cloud_env.txt # Download and run install script - curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai2_install.sh -o /opt/aai2_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh cd /opt - chmod +x aai2_install.sh - ./aai2_install.sh + chmod +x aai_install.sh + ./aai_install.sh # MSO instantiation -- cgit 1.2.3-korg