From: Marco Platania <platania@research.att.com>
Date: Fri, 18 May 2018 15:43:14 +0000 (+0000)
Subject: Merge "Retrieve boot scripts from new demo artifact zip"
X-Git-Tag: v1.2.1~43
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=641b19e5fddf06de6b047590586478404e414899;hp=-c;p=demo.git

Merge "Retrieve boot scripts from new demo artifact zip"
---

641b19e5fddf06de6b047590586478404e414899
diff --combined heat/ONAP/onap_openstack.yaml
index 11ce2a06,29b7515a..9ac38120
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@@ -170,11 -170,6 +170,11 @@@ parameters
      type: string
      description: CIDR of the OAM ONAP network
  
 +  use_oam_net_for_robot:
 +    type: boolean
 +    description: Whether to use oam_network for Robot VNFs or not.  The default is false, which uses public_net_id.  Set to true if the Robot VNFs are unable to bind to the public network (needed by TLAB).
 +    default: false
 +
    ### Private IP addresses ###
    aai1_ip_addr:
      type: string
@@@ -693,7 -688,10 +693,10 @@@ resources
              echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dns_install.sh -o /opt/dns_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt dns_install.sh
              cd /opt
              chmod +x dns_install.sh
              ./dns_install.sh
@@@ -766,7 -764,10 +769,10 @@@
              echo "__aai_repo__" > /opt/config/remote_repo.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt aai_install.sh
              cd /opt
              chmod +x aai_install.sh
              ./aai_install.sh
@@@ -835,7 -836,10 +841,10 @@@
              echo "__aai_repo__" > /opt/config/remote_repo.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt aai_install.sh
              cd /opt
              chmod +x aai_install.sh
              ./aai_install.sh
@@@ -916,7 -920,10 +925,10 @@@
              echo "__so_repo__" > /opt/config/remote_repo.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/so_install.sh -o /opt/so_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt so_install.sh
              cd /opt
              chmod +x so_install.sh
              ./so_install.sh
@@@ -983,7 -990,10 +995,10 @@@
              echo "__dbcl_docker__" > /opt/config/docker_version.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt mr_install.sh
              cd /opt
              chmod +x mr_install.sh
              ./mr_install.sh
@@@ -1062,12 -1072,10 +1077,12 @@@
              __vm_image_name__: { get_param: ubuntu_1404_image }
              __vm_flavor__: { get_param: flavor_medium }
              __public_net_id__: { get_param: public_net_id }
 +            __oam_network_id__: { get_resource: oam_onap }
              __script_version__: { get_param: artifacts_version }
              __robot_repo__: { get_param: robot_repo }
              __docker_version__: { get_param: robot_docker }
              __vnf_pub_key__: { get_param: pub_key }
 +            __use_oam_net_for_robot__: { get_param: use_oam_net_for_robot }
            template: |
              #!/bin/bash
  
@@@ -1117,13 -1125,7 +1132,13 @@@
              echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt
              echo "__vm_image_name__" > /opt/config/vm_image_name.txt
              echo "__script_version__" > /opt/config/script_version.txt
 -            echo "__public_net_id__" > /opt/config/public_net_id.txt
 +            if [ "__use_oam_net_for_robot__" != "False" ] && [ "__use_oam_net_for_robot__" != "false" ]; then
 +              echo "__oam_network_id__" > /opt/config/public_net_id.txt
 +            else
 +              echo "__public_net_id__" > /opt/config/public_net_id.txt
 +            fi
 +            echo "__oam_network_id__" > /opt/config/oam_network_id.txt
 +            echo "__use_oam_net_for_robot__" > /opt/config/use_oam_net_for_robot.txt
              echo "__vnf_pub_key__" > /opt/config/vnf_pub_key.txt
              echo "__robot_repo__" > /opt/config/remote_repo.txt
              echo "localhost" > /opt/config/log_elasticsearch_ip_addr.txt # these tests will be skipped by robot
@@@ -1131,7 -1133,10 +1146,10 @@@
              echo "localhost" > /opt/config/log_kibana_ip_addr.txt # these tests will be skipped by robot
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/robot_install.sh -o /opt/robot_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt robot_install.sh
              cd /opt
              chmod +x robot_install.sh
              ./robot_install.sh
@@@ -1198,7 -1203,10 +1216,10 @@@
              echo "__vid_repo__" > /opt/config/remote_repo.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/vid_install.sh -o /opt/vid_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt vid_install.sh
              cd /opt
              chmod +x vid_install.sh
              ./vid_install.sh
@@@ -1267,7 -1275,10 +1288,10 @@@
              echo "__sdnc_repo__" > /opt/config/remote_repo.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdnc_install.sh -o /opt/sdnc_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt sdnc_install.sh
              cd /opt
              chmod +x sdnc_install.sh
              ./sdnc_install.sh
@@@ -1351,7 -1362,10 +1375,10 @@@
              echo "__sdc_repo__" > /opt/config/remote_repo.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdc_install.sh -o /opt/sdc_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt sdc_install.sh
              cd /opt
              chmod +x sdc_install.sh
              ./sdc_install.sh
@@@ -1422,7 -1436,10 +1449,10 @@@
              echo "__portal_repo__" > /opt/config/remote_repo.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/portal_install.sh -o /opt/portal_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt portal_install.sh
              cd /opt
              chmod +x portal_install.sh
              ./portal_install.sh
@@@ -1491,7 -1508,10 +1521,10 @@@
              echo "__policy_repo__" > /opt/config/remote_repo.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/policy_install.sh -o /opt/policy_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt policy_install.sh
              cd /opt
              chmod +x policy_install.sh
              ./policy_install.sh
@@@ -1562,7 -1582,10 +1595,10 @@@
              echo "__appc_repo__" > /opt/config/remote_repo.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt appc_install.sh
              cd /opt
              chmod +x appc_install.sh
              ./appc_install.sh
@@@ -1641,7 -1664,10 +1677,10 @@@
              echo "__clamp_repo__" > /opt/config/remote_repo.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt clamp_install.sh
              cd /opt
              chmod +x clamp_install.sh
              ./clamp_install.sh
@@@ -1783,7 -1809,10 +1822,10 @@@
              echo "export OPENO_IP=__openo_ip_addr__" >> /opt/config/onap_ips.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/openo_install.sh -o /opt/openo_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt openo_install.sh
              cd /opt
              chmod +x openo_install.sh
              ./openo_install.sh
@@@ -1996,7 -2025,10 +2038,10 @@@
              echo "__holmes_rm_docker__" > /opt/config/holmes_docker_rm.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae2_install.sh -o /opt/dcae2_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt dcae2_install.sh
              cd /opt
              chmod +x dcae2_install.sh
              ./dcae2_install.sh > /tmp/dcae2_install.log 2>&1
@@@ -2063,7 -2095,10 +2108,10 @@@
              echo "__external_dns__" > /opt/config/external_dns.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/music_install.sh -o /opt/music_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt music_install.sh
              cd /opt
              chmod +x music_install.sh
              ./music_install.sh
@@@ -2130,7 -2165,10 +2178,10 @@@
              echo "__external_dns__" > /opt/config/external_dns.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/oof_install.sh -o /opt/oof_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt oof_install.sh
              cd /opt
              chmod +x oof_install.sh
              ./oof_install.sh
@@@ -2199,7 -2237,10 +2250,10 @@@
              echo "__local_ip__" > /opt/config/local_ip.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aaf_install.sh -o /opt/aaf_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt aaf_install.sh
              cd /opt
              chmod +x aaf_install.sh
              ./aaf_install.sh
@@@ -2267,7 -2308,10 +2321,10 @@@
              echo "__local_ip__" > /opt/config/local_ip.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sms_install.sh -o /opt/sms_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt sms_install.sh
              cd /opt
              chmod +x sms_install.sh
              ./sms_install.sh
@@@ -2339,7 -2383,10 +2396,10 @@@
              echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
  
              # Download and run install script
-             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/nbi_install.sh -o /opt/nbi_install.sh
+             apt-get -y install unzip
+             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+             curl -k -L "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+             unzip -j /opt/boot-__artifacts_version__.zip -d /opt nbi_install.sh
              cd /opt
              chmod +x nbi_install.sh
              ./nbi_install.sh