X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.yaml;h=2316816e29f58cf10359274d598d2278b496dddf;hb=88eeb55cade0caf1fbde24ec9012439b2a9d58c3;hp=bdbc0ee2053ad00b37661c938c659e10ad298893;hpb=e021421ef6df0ab9988aeeb4be68f1dc9b36598d;p=demo.git diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index bdbc0ee2..2316816e 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -88,9 +88,10 @@ parameters: type: string description: Public key to be installed on the compute instance - nexus_repo: + nexus_artifact_repo: type: string - description: Complete URL for the Nexus repository. + description: Complete URL for the Nexus repository for Maven artifacts. + default: "https://nexus.onap.org" nexus_docker_repo: type: string @@ -170,6 +171,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 @@ -629,7 +635,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __artifacts_version__: { get_param: artifacts_version } __oam_network_cidr__: { get_attr: [oam_onap_subnet, cidr] } __dns_ip_addr__: { get_param: dns_ip_addr } @@ -660,7 +666,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt @@ -688,7 +694,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 "__nexus_artifact_repo__/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 @@ -727,7 +736,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -745,7 +754,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -761,7 +770,10 @@ resources: 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 "__nexus_artifact_repo__/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 @@ -798,7 +810,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -815,7 +827,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -830,7 +842,10 @@ resources: 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 "__nexus_artifact_repo__/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 @@ -868,7 +883,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -891,7 +906,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -911,7 +926,10 @@ resources: 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 "__nexus_artifact_repo__/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 @@ -949,7 +967,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -965,7 +983,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -978,7 +996,10 @@ resources: 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 "__nexus_artifact_repo__/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 @@ -1016,7 +1037,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1057,17 +1078,19 @@ resources: __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 # Create configuration files mkdir -p /opt/config echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__network_name__" > /opt/config/network.txt @@ -1110,7 +1133,13 @@ resources: 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 @@ -1118,7 +1147,10 @@ resources: 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 "__nexus_artifact_repo__/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 @@ -1156,7 +1188,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1172,7 +1204,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -1185,7 +1217,10 @@ resources: 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 "__nexus_artifact_repo__/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 @@ -1223,7 +1258,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1240,7 +1275,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -1254,7 +1289,10 @@ resources: 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 "__nexus_artifact_repo__/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 @@ -1301,7 +1339,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1321,7 +1359,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -1338,7 +1376,10 @@ resources: 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 "__nexus_artifact_repo__/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 @@ -1376,7 +1417,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1394,7 +1435,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -1409,7 +1450,10 @@ resources: 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 "__nexus_artifact_repo__/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 @@ -1447,7 +1491,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1464,7 +1508,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -1478,7 +1522,10 @@ resources: 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 "__nexus_artifact_repo__/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 @@ -1516,7 +1563,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1534,7 +1581,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -1549,7 +1596,10 @@ resources: 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 "__nexus_artifact_repo__/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 @@ -1587,7 +1637,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1609,7 +1659,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -1628,7 +1678,10 @@ resources: 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 "__nexus_artifact_repo__/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 @@ -1666,7 +1719,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1718,7 +1771,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -1770,7 +1823,10 @@ resources: 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 "__nexus_artifact_repo__/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 @@ -1814,7 +1870,7 @@ resources: # repo related __artifacts_version__: { get_param: artifacts_version } __docker_version__: { get_param: dcae_docker } - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -1905,7 +1961,7 @@ resources: # repo related echo "__docker_version__" > /opt/config/docker_version.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -1983,7 +2039,10 @@ resources: 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 "__nexus_artifact_repo__/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 @@ -2021,7 +2080,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -2037,7 +2096,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -2050,7 +2109,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__/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 "__nexus_artifact_repo__/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 @@ -2088,7 +2150,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -2104,7 +2166,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -2117,7 +2179,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__/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 "__nexus_artifact_repo__/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 @@ -2155,7 +2220,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -2172,7 +2237,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -2186,7 +2251,10 @@ resources: 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 "__nexus_artifact_repo__/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 @@ -2223,7 +2291,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -2240,7 +2308,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -2254,7 +2322,10 @@ resources: 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 "__nexus_artifact_repo__/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 @@ -2291,7 +2362,7 @@ resources: user_data: str_replace: params: - __nexus_repo__: { get_param: nexus_repo } + __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } @@ -2310,7 +2381,7 @@ resources: # Create configuration files mkdir -p /opt/config - echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt @@ -2326,7 +2397,10 @@ resources: 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 "__nexus_artifact_repo__/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