X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.yaml;h=45b6523b879b012c9a3a955f15fd37820bccc85a;hb=87c9574f9a546f606082de6ff37bc1c3d7cad805;hp=29b7515a67c981bed923d5295f4c6e353a87bcab;hpb=dcff5656148560b3e6ef267b54a88e34ff6d2490;p=demo.git diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 29b7515a..45b6523b 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -72,10 +72,6 @@ parameters: type: string description: Name of the Extra Large Flavor supported by the cloud provider - flavor_xxlarge: - type: string - description: Name of the Extra Extra Large Flavor supported by the cloud provider - vm_base_name: type: string description: Base name of ONAP VMs @@ -88,9 +84,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 @@ -132,10 +129,6 @@ parameters: type: string description: OpenStack password or API Key - horizon_url: - type: string - description: URL of OpenStack Horizon - keystone_url: type: string description: URL of OpenStack Keystone @@ -170,6 +163,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 @@ -220,51 +218,63 @@ parameters: dcae_deployment_profile: type: string - description: DCAE deployment profile. Currently supported profiles R1, R2MVP. + default: R2 + description: DCAE deployment profile. Currently supported profiles R2, R2MVP, and R2PLUS. dnsaas_config_enabled: type: string - description: whether the DNSaaS configuration section is enabled + default: "" + description: (deprecated in R2) whether the DNSaaS configuration section is enabled dnsaas_region: type: string - description: the region of the cloud instance providing the Designate DNS as a Service + default: "" + description: (deprecated in R2) the region of the cloud instance providing the Designate DNS as a Service dnsaas_keystone_url: type: string - description: the keystone URL of the cloud instance providing the Designate DNS as a Service + default: "" + description: (deprecated in R2) the keystone URL of the cloud instance providing the Designate DNS as a Service dnsaas_username: type: string - description: the username of the cloud instance providing the Designate DNS as a Service + default: "" + description: (deprecated in R2) the username of the cloud instance providing the Designate DNS as a Service dnsaas_password: type: string - description: the password of the cloud instance providing the Designate DNS as a Service + default: "" + description: (deprecated in R2) the password of the cloud instance providing the Designate DNS as a Service dnsaas_tenant_name: type: string - description: the name of the tenant in the cloud instance providing the Designate DNS as a Service + default: "" + description: (deprecated in R2) the name of the tenant in the cloud instance providing the Designate DNS as a Service dcae_keystone_url: type: string - description: the keystone URL for DCAE to use (via MultiCloud) + default: "" + description: (deprecated in R2) the keystone URL for DCAE to use (via MultiCloud) dcae_private_key: type: string - description: the private key of the key-apir used between the DCAE bootstrap container and DCAE VMs + default: "" + description: (deprecated in R2) the private key of the key-apir used between the DCAE bootstrap container and DCAE VMs dcae_public_key: type: string - description: the prublic key of the key-apir used between the DCAE bootstrap container and DCAE VMs + default: "" + description: (deprecated in R2) the prublic key of the key-apir used between the DCAE bootstrap container and DCAE VMs dcae_centos_7_image: type: string - description: the id/name of the CentOS 7 VM imange + default: "" + description: (deprecated in R2) the id/name of the CentOS 7 VM imange dcae_domain: type: string - description: the top level domain to register DCAE VMs (the zone will be random-str.dcae_domain) + default: "" + description: (deprecated in R2) the top level domain to register DCAE VMs (the zone will be random-str.dcae_domain) ##################### # # @@ -400,6 +410,8 @@ parameters: type: string robot_docker: type: string + sniro_docker: + type: string sdc_docker: type: string sdc_wfd_docker: @@ -629,7 +641,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 +672,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 @@ -690,7 +702,7 @@ resources: # Download and run install script 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 + 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 @@ -730,7 +742,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 } @@ -748,7 +760,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 @@ -766,7 +778,7 @@ resources: # Download and run install script 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 + 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 @@ -804,7 +816,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 } @@ -821,7 +833,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 @@ -838,7 +850,7 @@ resources: # Download and run install script 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 + 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 @@ -877,7 +889,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 } @@ -900,7 +912,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 @@ -922,7 +934,7 @@ resources: # Download and run install script 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 + 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 @@ -961,7 +973,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 } @@ -977,7 +989,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 @@ -992,7 +1004,7 @@ resources: # Download and run install script 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 + 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 @@ -1031,7 +1043,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 } @@ -1072,17 +1084,20 @@ 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 } + __sniro_docker_version__: { get_param: sniro_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 @@ -1092,6 +1107,7 @@ resources: echo "__openstack_region__" > /opt/config/region.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__docker_version__" > /opt/config/docker_version.txt + echo "__sniro_docker_version__" > /opt/config/sniro_docker_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__keystone_url__" > /opt/config/keystone.txt @@ -1125,7 +1141,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 @@ -1135,7 +1157,7 @@ resources: # Download and run install script 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 + 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 @@ -1174,7 +1196,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 } @@ -1190,7 +1212,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 @@ -1205,7 +1227,7 @@ resources: # Download and run install script 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 + 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 @@ -1244,7 +1266,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 } @@ -1261,7 +1283,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 @@ -1277,7 +1299,7 @@ resources: # Download and run install script 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 + 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 @@ -1325,7 +1347,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 } @@ -1345,7 +1367,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 @@ -1364,7 +1386,7 @@ resources: # Download and run install script 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 + 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 @@ -1403,7 +1425,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 } @@ -1421,7 +1443,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 @@ -1438,7 +1460,7 @@ resources: # Download and run install script 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 + 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 @@ -1477,7 +1499,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 } @@ -1494,7 +1516,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 @@ -1510,7 +1532,7 @@ resources: # Download and run install script 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 + 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 @@ -1549,7 +1571,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 } @@ -1567,7 +1589,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 @@ -1584,7 +1606,7 @@ resources: # Download and run install script 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 + 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 @@ -1623,7 +1645,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 } @@ -1645,7 +1667,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 @@ -1666,7 +1688,7 @@ resources: # Download and run install script 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 + 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 @@ -1705,7 +1727,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 } @@ -1757,7 +1779,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 @@ -1811,7 +1833,7 @@ resources: # Download and run install script 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 + 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 @@ -1856,7 +1878,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 } @@ -1947,7 +1969,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 @@ -2027,7 +2049,7 @@ resources: # Download and run install script 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 + 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 @@ -2066,7 +2088,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 } @@ -2082,7 +2104,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 @@ -2097,7 +2119,7 @@ resources: # Download and run install script 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 + 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 @@ -2136,7 +2158,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 } @@ -2152,7 +2174,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 @@ -2167,7 +2189,7 @@ resources: # Download and run install script 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 + 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 @@ -2206,7 +2228,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 } @@ -2223,7 +2245,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 @@ -2239,7 +2261,7 @@ resources: # Download and run install script 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 + 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 @@ -2277,7 +2299,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 } @@ -2294,7 +2316,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 @@ -2310,7 +2332,7 @@ resources: # Download and run install script 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 + 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 @@ -2348,7 +2370,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 } @@ -2367,7 +2389,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 @@ -2385,7 +2407,7 @@ resources: # Download and run install script 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 + 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