diff options
Diffstat (limited to 'heat')
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 4 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 311 |
2 files changed, 314 insertions, 1 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 72cf6e4a..f016b0b0 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -54,6 +54,10 @@ parameters: cloud_env: openstack + http_proxy: PUT YOUR HTTP PROXY ADDRESS (if you don't work behind a proxy put no_proxy) + + https_proxy: PUT YOUR HTTPS PROXY ADDRESS (if you don't work behind a proxy put no_proxy) + ###################### # # diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index f9c2528f..2eaaf738 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -141,6 +141,16 @@ parameters: type: string description: Region where the DCAE controller will spin the VMs + http_proxy: + type: string + description: http proxy address + default: 'no_proxy' + + https_proxy: + type: string + description: https proxy address + default: 'no_proxy' + ###################### # # # Network parameters # @@ -643,6 +653,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __artifacts_version__: { get_param: artifacts_version } __oam_network_cidr__: { get_attr: [oam_onap_subnet, cidr] } @@ -700,8 +712,21 @@ resources: echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -744,6 +769,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -774,8 +801,21 @@ resources: echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__aai_repo__" > /opt/config/remote_repo.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -816,6 +856,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -846,8 +888,21 @@ resources: echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__aai_repo__" > /opt/config/remote_repo.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -889,6 +944,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -930,8 +987,21 @@ resources: echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__so_repo__" > /opt/config/remote_repo.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -973,6 +1043,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -1000,8 +1072,21 @@ resources: echo "__external_dns__" > /opt/config/external_dns.txt echo "__mr_repo__" > /opt/config/remote_repo.txt echo "__dbcl_docker__" > /opt/config/docker_version.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -1043,6 +1128,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -1153,8 +1240,21 @@ resources: echo "localhost" > /opt/config/log_elasticsearch_ip_addr.txt # these tests will be skipped by robot echo "localhost" > /opt/config/log_logstash_ip_addr.txt # these tests will be skipped by robot echo "localhost" > /opt/config/log_kibana_ip_addr.txt # these tests will be skipped by robot + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -1196,6 +1296,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -1223,8 +1325,21 @@ resources: echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__vid_repo__" > /opt/config/remote_repo.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -1266,6 +1381,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -1295,8 +1412,21 @@ resources: echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__sdnc_repo__" > /opt/config/remote_repo.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -1347,6 +1477,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -1382,8 +1514,21 @@ resources: echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__sdc_repo__" > /opt/config/remote_repo.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -1425,6 +1570,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -1456,8 +1603,21 @@ resources: echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__portal_repo__" > /opt/config/remote_repo.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -1466,7 +1626,6 @@ resources: chmod +x portal_install.sh ./portal_install.sh - # Policy Engine instantiation policy_private_port: type: OS::Neutron::Port @@ -1499,6 +1658,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -1528,8 +1689,21 @@ resources: echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__policy_repo__" > /opt/config/remote_repo.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -1571,6 +1745,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -1602,8 +1778,21 @@ resources: echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__appc_repo__" > /opt/config/remote_repo.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -1645,6 +1834,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -1684,8 +1875,21 @@ resources: echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt echo "__clamp_repo__" > /opt/config/remote_repo.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -1727,6 +1931,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -1829,8 +2035,21 @@ resources: echo "export VID_IP=__vid_ip_addr__" >> /opt/config/onap_ips.txt echo "export CLAMP_IP=__clamp_ip_addr__" >> /opt/config/onap_ips.txt echo "export OPENO_IP=__openo_ip_addr__" >> /opt/config/onap_ips.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -1876,6 +2095,8 @@ resources: params: __rand_str__: { get_resource: random-str } # repo related + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __artifacts_version__: { get_param: artifacts_version } __docker_version__: { get_param: dcae_docker } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } @@ -2045,8 +2266,21 @@ resources: echo "__dcae_prh_docker__" > /opt/config/dcae_docker_prh.txt echo "__holmes_em_docker__" > /opt/config/holmes_docker_em.txt echo "__holmes_rm_docker__" > /opt/config/holmes_docker_rm.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -2088,6 +2322,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -2115,8 +2351,21 @@ resources: echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -2158,6 +2407,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -2191,8 +2442,21 @@ resources: echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__external_dns__" > /opt/config/external_dns.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -2234,6 +2498,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -2263,8 +2529,21 @@ resources: echo "__aaf_repo__" > /opt/config/remote_repo.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__local_ip__" > /opt/config/local_ip.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -2305,6 +2584,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -2334,8 +2615,21 @@ resources: echo "__sms_repo__" > /opt/config/remote_repo.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__local_ip__" > /opt/config/local_ip.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 @@ -2376,6 +2670,8 @@ resources: user_data: str_replace: params: + __http_proxy__: { get_param: http_proxy } + __https_proxy__: { get_param: https_proxy } __nexus_artifact_repo__: { get_param: nexus_artifact_repo } __nexus_docker_repo__: { get_param: nexus_docker_repo } __nexus_username__: { get_param: nexus_username } @@ -2409,8 +2705,21 @@ resources: echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__aai1_ip_addr__" > /opt/config/aai_ip_addr.txt echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt + echo "__http_proxy__" > /opt/config/http_proxy.txt + echo "__https_proxy__" > /opt/config/https_proxy.txt + if [ __http_proxy__ != "no_proxy" ] + then + echo "Acquire" > /etc/apt/apt.conf.d/apt.conf + echo "{" >> /etc/apt/apt.conf.d/apt.conf + echo " Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf + echo " http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo " https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf + echo "};" >> /etc/apt/apt.conf.d/apt.conf # Download and run install script + export http_proxy=__http_proxy__ + export https_proxy=__https_proxy__ + fi 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 |