From 6c850ae66f515d6990d2d94e02a5bc7be17d3a9f Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Wed, 16 Aug 2017 09:25:40 -0400 Subject: [PATCH] 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 --- boot/aai2_install.sh | 110 ---------------------------------- boot/aai2_serv.sh | 98 ------------------------------ boot/aai2_vm_init.sh | 16 ----- boot/aai_install.sh | 19 +++++- boot/aai_vm_init.sh | 45 +++----------- boot/bind_zones | 2 + boot/db_openecomp_org | 109 --------------------------------- boot/db_simpledemo_openecomp_org | 1 + 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 ++-- 12 files changed, 53 insertions(+), 395 deletions(-) delete mode 100644 boot/aai2_install.sh delete mode 100644 boot/aai2_serv.sh delete mode 100644 boot/aai2_vm_init.sh delete mode 100644 boot/db_openecomp_org diff --git a/boot/aai2_install.sh b/boot/aai2_install.sh deleted file mode 100644 index d2708018..00000000 --- a/boot/aai2_install.sh +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/bash - -# Read configuration files -NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) -ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) -DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) -CLOUD_ENV=$(cat /opt/config/cloud_env.txt) -GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) -AAI_INSTANCE=$(cat /opt/config/aai_instance.txt) -MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) - -# Add host name to /etc/host to avoid warnings in openstack images -if [[ $CLOUD_ENV != "rackspace" ]] -then - echo 127.0.0.1 $(hostname) >> /etc/hosts - - # Allow remote login as root - mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk - cp /home/ubuntu/.ssh/authorized_keys /root/.ssh -fi - -# Set private IP in /etc/network/interfaces manually in the presence of public interface -# Some VM images don't add the private interface automatically, we have to do it during the component installation -if [[ $CLOUD_ENV == "openstack_nofloat" ]] -then - LOCAL_IP=$(cat /opt/config/local_ip_addr.txt) - CIDR=$(cat /opt/config/oam_network_cidr.txt) - BITMASK=$(echo $CIDR | cut -d"/" -f2) - - # Compute the netmask based on the network cidr - if [[ $BITMASK == "8" ]] - then - NETMASK=255.0.0.0 - elif [[ $BITMASK == "16" ]] - then - NETMASK=255.255.0.0 - elif [[ $BITMASK == "24" ]] - then - NETMASK=255.255.255.0 - fi - - echo "auto eth1" >> /etc/network/interfaces - echo "iface eth1 inet static" >> /etc/network/interfaces - echo " address $LOCAL_IP" >> /etc/network/interfaces - echo " netmask $NETMASK" >> /etc/network/interfaces - echo " mtu $MTU" >> /etc/network/interfaces - ifup eth1 -fi - -# Download dependencies -add-apt-repository -y ppa:openjdk-r/ppa -apt-get update -apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make - -# Download scripts from Nexus -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/aai2_vm_init.sh -o /opt/aai2_vm_init.sh -curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/aai2_serv.sh -o /opt/aai2_serv.sh -chmod +x /opt/aai2_vm_init.sh -chmod +x /opt/aai2_serv.sh -mv /opt/aai2_serv.sh /etc/init.d -update-rc.d aai2_serv.sh defaults - -# Download and install docker-engine and docker-compose -echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list -apt-get update -apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual -apt-get install -y --allow-unauthenticated docker-engine - -mkdir /opt/docker -curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose -chmod +x /opt/docker/docker-compose - -# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP -DNS_FLAG="" -if [ -s /opt/config/dns_ip_addr.txt ] -then - DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) " -fi -if [ -s /opt/config/external_dns.txt ] -then - DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) " -fi -echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker - -cp /lib/systemd/system/docker.service /etc/systemd/system -sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service -service docker restart - -# DNS IP address configuration -echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head -resolvconf -u - -# Run docker containers -cd /opt -git clone -b $GERRIT_BRANCH --single-branch http://gerrit.onap.org/r/aai/test-config - -if [[ $AAI_INSTANCE == "aai_instance_1" ]] -then - mkdir -p /opt/aai/logroot/AAI-RESOURCES - mkdir -p /opt/aai/logroot/AAI-TRAVERSAL - mkdir -p /opt/aai/logroot/AAI-ML - mkdir -p /opt/aai/logroot/AAI-SDB - mkdir -p /opt/aai/logroot/AAI-DRMS - mkdir -p /opt/aai/logroot/AAI-UI - chown -R 999:999 /opt/aai/logroot/AAI-RESOURCES /opt/aai/logroot/AAI-TRAVERSAL - - sleep 300 -fi - -./aai2_vm_init.sh \ No newline at end of file diff --git a/boot/aai2_serv.sh b/boot/aai2_serv.sh deleted file mode 100644 index add00097..00000000 --- a/boot/aai2_serv.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Start daemon at boot time -# Description: Enable service provided by daemon. -### END INIT INFO - -dir="/opt" -cmd="./aai2_vm_init.sh" -user="root" - -name=`basename $0` -pid_file="/var/run/$name.pid" -stdout_log="/var/log/$name.log" -stderr_log="/var/log/$name.err" - -get_pid() { - cat "$pid_file" -} - -is_running() { - [ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1 -} - -case "$1" in - start) - if is_running; then - echo "Already started" - else - echo "Starting $name" - cd "$dir" - if [ -z "$user" ]; then - sudo $cmd >> "$stdout_log" 2>> "$stderr_log" & - else - sudo -u "$user" $cmd >> "$stdout_log" 2>> "$stderr_log" & - fi - echo $! > "$pid_file" - if ! is_running; then - echo "Unable to start, see $stdout_log and $stderr_log" - exit 1 - fi - fi - ;; - stop) - if is_running; then - echo -n "Stopping $name.." - kill `get_pid` - for i in {1..10} - do - if ! is_running; then - break - fi - - echo -n "." - sleep 1 - done - echo - - if is_running; then - echo "Not stopped; may still be shutting down or shutdown may have failed" - exit 1 - else - echo "Stopped" - if [ -f "$pid_file" ]; then - rm "$pid_file" - fi - fi - else - echo "Not running" - fi - ;; - restart) - $0 stop - if is_running; then - echo "Unable to stop, will not attempt to start" - exit 1 - fi - $0 start - ;; - status) - if is_running; then - echo "Running" - else - echo "Stopped" - exit 1 - fi - ;; - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; -esac - -exit 0 diff --git a/boot/aai2_vm_init.sh b/boot/aai2_vm_init.sh deleted file mode 100644 index ffe0955f..00000000 --- a/boot/aai2_vm_init.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -AAI_INSTANCE=$(cat /opt/config/aai_instance.txt) - -cd /opt/test-config -git pull - -if [[ $AAI_INSTANCE == "aai_instance_1" ]] -then - ./deploy_vm1.sh -elif [[ $AAI_INSTANCE == "aai_instance_2" ]] -then - ./deploy_vm2.sh -else - echo "Invalid instance. Exiting..." -fi diff --git a/boot/aai_install.sh b/boot/aai_install.sh index d4a04ed4..bc62db9f 100644 --- a/boot/aai_install.sh +++ b/boot/aai_install.sh @@ -5,6 +5,8 @@ NEXUS_REPO=$(cat /opt/config/nexus_repo.txt) ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt) DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) +GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) +AAI_INSTANCE=$(cat /opt/config/aai_instance.txt) MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) # Add host name to /etc/host to avoid warnings in openstack images @@ -89,7 +91,20 @@ echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head resolvconf -u # Run docker containers -mkdir -p /opt/openecomp/aai/logs -mkdir -p /opt/openecomp/aai/data cd /opt +git clone -b $GERRIT_BRANCH --single-branch http://gerrit.onap.org/r/aai/test-config + +if [[ $AAI_INSTANCE == "aai_instance_1" ]] +then + mkdir -p /opt/aai/logroot/AAI-RESOURCES + mkdir -p /opt/aai/logroot/AAI-TRAVERSAL + mkdir -p /opt/aai/logroot/AAI-ML + mkdir -p /opt/aai/logroot/AAI-SDB + mkdir -p /opt/aai/logroot/AAI-DRMS + mkdir -p /opt/aai/logroot/AAI-UI + chown -R 999:999 /opt/aai/logroot/AAI-RESOURCES /opt/aai/logroot/AAI-TRAVERSAL + + sleep 300 +fi + ./aai_vm_init.sh \ No newline at end of file diff --git a/boot/aai_vm_init.sh b/boot/aai_vm_init.sh index 6fcf7b0e..ffe0955f 100644 --- a/boot/aai_vm_init.sh +++ b/boot/aai_vm_init.sh @@ -1,43 +1,16 @@ #!/bin/bash -NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) -NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) -NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt) -DMAAP_TOPIC=$(cat /opt/config/dmaap_topic.txt) -DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) +AAI_INSTANCE=$(cat /opt/config/aai_instance.txt) -# Pull HBase container from a public docker hub -docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/aaidocker/aai-hbase-1.2.3 -docker rm -f hbase-1.2.3 -docker run -d --net=host --name="hbase-1.2.3" $NEXUS_DOCKER_REPO/aaidocker/aai-hbase-1.2.3 +cd /opt/test-config +git pull -# Wait 3 minutes before instantiating the A&AI container -sleep 180 - -docker pull $NEXUS_DOCKER_REPO/openecomp/ajsc-aai:$DOCKER_IMAGE_VERSION -docker rm -f aai-service -docker run --name=aai-service --net=host -v /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt -it -e AAI_REPO_PATH=r/aai -e AAI_CHEF_ENV=simpledemo -d -e AAI_CHEF_LOC=/var/chef/aai-data/environments -e docker_gitbranch=release-1.0.0 $NEXUS_DOCKER_REPO/openecomp/ajsc-aai:$DOCKER_IMAGE_VERSION - -docker pull $NEXUS_DOCKER_REPO/openecomp/model-loader:$DOCKER_IMAGE_VERSION -docker rm -f model-loader-service - -# Start Model Loader container only if SDC is up and running -# Use the default SDC private IP address if no file exists or the file is empty -if [[ -s "/opt/config/sdc_ip_addr.txt" ]] +if [[ $AAI_INSTANCE == "aai_instance_1" ]] +then + ./deploy_vm1.sh +elif [[ $AAI_INSTANCE == "aai_instance_2" ]] then - SDC_IP_ADDR=$(cat /opt/config/sdc_ip_addr.txt) + ./deploy_vm2.sh else - SDC_IP_ADDR="10.0.3.1" + echo "Invalid instance. Exiting..." fi - -# Run Health Check against SDC and verify that all five components are up -RES=$(curl http://$SDC_IP_ADDR:8181/sdc1/rest/healthCheck | grep -c "OK") -while [[ $RES -lt 5 ]] -do - RES=$(curl http://$SDC_IP_ADDR:8181/sdc1/rest/healthCheck | grep -c "OK") -done - -# At this point, SDC is healthy and Model Loader container can start -docker run --name=model-loader-service -it -d -e DISTR_CLIENT_ASDC_ADDRESS=c2.vm1.sdc.simpledemo.openecomp.org:8443 -e DISTR_CLIENT_ENVIRONMENT_NAME=$DMAAP_TOPIC -e DISTR_CLIENT_USER=aai -e DISTR_CLIENT_PASSWORD=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp -e APP_SERVER_BASE_URL=https://c1.vm1.aai.simpledemo.openecomp.org:8443 -e APP_SERVER_KEYSTORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o -e APP_SERVER_AUTH_USER=ModelLoader -e APP_SERVER_AUTH_PASSWORD=OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw $NEXUS_DOCKER_REPO/openecomp/model-loader:$DOCKER_IMAGE_VERSION - diff --git a/boot/bind_zones b/boot/bind_zones index 0893ca64..01d8128c 100644 --- a/boot/bind_zones +++ b/boot/bind_zones @@ -77,6 +77,8 @@ vm1.mr.simpledemo.openecomp.org. IN A mr_ip_addr ;CNAMES ;A&AI aai.api.simpledemo.openecomp.org. IN CNAME vm1.aai.simpledemo.openecomp.org. +aai.ui.simpledemo.openecomp.org. IN CNAME vm1.aai.simpledemo.openecomp.org. +aai.searchservice.simpledemo.openecomp.org. IN CNAME vm1.aai.simpledemo.openecomp.org. aai.hbase.simpledemo.openecomp.org. IN CNAME vm2.aai.simpledemo.openecomp.org. aai.gremlinserver.simpledemo.openecomp.org. IN CNAME vm2.aai.simpledemo.openecomp.org. aai.elasticsearch.simpledemo.openecomp.org. IN CNAME vm2.aai.simpledemo.openecomp.org. diff --git a/boot/db_openecomp_org b/boot/db_openecomp_org deleted file mode 100644 index be42b603..00000000 --- a/boot/db_openecomp_org +++ /dev/null @@ -1,109 +0,0 @@ -; -; BIND data file for local loopback interface -; -$TTL 604800 -@ IN SOA openecomp.org. admin.openecomp.org. ( - 20161202 ; Serial - 604800 ; Refresh - 86400 ; Retry - 2419200 ; Expire - 604800 ) ; Negative Cache TTL -; -; name servers - NS records - IN NS openecomp.org. - -; name servers - A records -openecomp.org. IN A 10.0.0.1 - -; -vm1.aai.simpledemo.openecomp.org. IN A 10.0.1.1 -c1.vm1.aai.simpledemo.openecomp.org. IN A 10.0.1.1 -c2.vm1.aai.simpledemo.openecomp.org. IN A 10.0.1.1 -c3.vm1.aai.simpledemo.openecomp.org. IN A 10.0.1.1 - -vm1.appc.simpledemo.openecomp.org. IN A 10.0.2.1 -c1.vm1.appc.simpledemo.openecomp.org. IN A 10.0.2.1 -c2.vm1.appc.simpledemo.openecomp.org. IN A 10.0.2.1 - -vm1.asdc.simpledemo.openecomp.org. IN A 10.0.3.1 -c1.vm1.asdc.simpledemo.openecomp.org. IN A 10.0.3.1 -c2.vm1.asdc.simpledemo.openecomp.org. IN A 10.0.3.1 -c3.vm1.asdc.simpledemo.openecomp.org. IN A 10.0.3.1 -c4.vm1.asdc.simpledemo.openecomp.org. IN A 10.0.3.1 - -vm1.dcae.simpledemo.openecomp.org. IN A 10.0.4.1 -c1.vm1.dcae.simpledemo.openecomp.org. IN A 10.0.4.1 -c2.vm1.dcae.simpledemo.openecomp.org. IN A 10.0.4.1 -c3.vm1.dcae.simpledemo.openecomp.org IN A 10.0.4.1 - -vm1.mso.simpledemo.openecomp.org. IN A 10.0.5.1 -c1.vm1.mso.simpledemo.openecomp.org. IN A 10.0.5.1 -c1.vm1.mso.simpledemo.openecomp.org. IN A 10.0.5.1 - -vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 -c1.vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 -c2.vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 -c3.vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 -c4.vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 -c5.vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 -c6.vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 -c7.vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 -c8.vm1.policy.simpledemo.openecomp.org. IN A 10.0.6.1 - -vm1.sdnc.simpledemo.openecomp.org. IN A 10.0.7.1 -c1.vm1.sdnc.simpledemo.openecomp.org. IN A 10.0.7.1 -c2.vm1.sdnc.simpledemo.openecomp.org. IN A 10.0.7.1 -c3.vm1.sdnc.simpledemo.openecomp.org. IN A 10.0.7.1 -c4.vm1.sdnc.simpledemo.openecomp.org. IN A 10.0.7.1 - -vm1.vid.simpledemo.openecomp.org. IN A 10.0.8.1 -c1.vm1.vid.simpledemo.openecomp.org. IN A 10.0.8.1 -c2.vm1.vid.simpledemo.openecomp.org. IN A 10.0.8.1 - -vm1.portal.simpledemo.openecomp.org. IN A 10.0.9.1 -c1.vm1.portal.simpledemo.openecomp.org. IN A 10.0.9.1 -c2.vm1.portal.simpledemo.openecomp.org. IN A 10.0.9.1 - -vm1.aaf.simpledemo.openecomp.org. IN A 10.0.12.1 - -vm1.mr.simpledemo.openecomp.org. IN A 10.0.11.1 - -;CNAMES -;A&AI -aai.api.simpledemo.openecomp.org. IN CNAME vm1.aai.simpledemo.openecomp.org. -aai.hbase.simpledemo.openecomp.org. IN CNAME vm1.aai.simpledemo.openecomp.org. - -;APPC -appc.api.simpledemo.openecomp.org. IN CNAME vm1.appc.simpledemo.openecomp.org. - -;ASDC -asdc.api.simpledemo.openecomp.org. IN CNAME vm1.asdc.simpledemo.openecomp.org. - -;DCAE -dcae.api.simpledemo.openecomp.org. IN CNAME vm1.dcae.simpledemo.openecomp.org. - -;MSO -mso.api.simpledemo.openecomp.org. IN CNAME vm1.mso.simpledemo.openecomp.org. - -;Policy -policy.api.simpledemo.openecomp.org. IN CNAME vm1.policy.simpledemo.openecomp.org. - -;SDNC -sdnc.api.simpledemo.openecomp.org. IN CNAME vm1.sdnc.simpledemo.openecomp.org. - -;VID -vid.api.simpledemo.openecomp.org. IN CNAME vm1.vid.simpledemo.openecomp.org. - -;PORTAL -portal.api.simpledemo.openecomp.org. IN CNAME vm1.portal.simpledemo.openecomp.org. - -;Message Router -;mr.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org. -ueb.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org. -mr.api.simpledemo.openecomp.org. IN A 10.0.4.102 -collector.api.simpledemo.openecomp.org. IN A 10.0.4.102 -;dbc.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org. -;drprov.api.simpledemo.openecomp.org. IN CNAME vm1.mr.simpledemo.openecomp.org. - -;AAF -aaf.api.simpledemo.openecomp.org. IN CNAME vm1.aaf.simpledemo.openecomp.org. \ No newline at end of file diff --git a/boot/db_simpledemo_openecomp_org b/boot/db_simpledemo_openecomp_org index f7d2b9dc..4209bfe0 100644 --- a/boot/db_simpledemo_openecomp_org +++ b/boot/db_simpledemo_openecomp_org @@ -78,6 +78,7 @@ vm1.mr.simpledemo.openecomp.org. IN A 10.0.11.1 ;A&AI aai.api.simpledemo.openecomp.org. IN CNAME vm1.aai.simpledemo.openecomp.org. aai.ui.simpledemo.openecomp.org. IN CNAME vm1.aai.simpledemo.openecomp.org. +aai.searchservice.simpledemo.openecomp.org. IN CNAME vm1.aai.simpledemo.openecomp.org. aai.hbase.simpledemo.openecomp.org. IN CNAME vm2.aai.simpledemo.openecomp.org. aai.gremlinserver.simpledemo.openecomp.org. IN CNAME vm2.aai.simpledemo.openecomp.org. aai.elasticsearch.simpledemo.openecomp.org. IN CNAME vm2.aai.simpledemo.openecomp.org. 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 -- 2.16.6