Code Review / demo.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Remove demo, testuite/properties repos in robot VM
[demo.git] / heat / ONAP / onap_openstack.yaml
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 2316816..ef5af38 100644 (file)
--- 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
@@ -133,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
@@ -149,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 #
@@ -226,51 +228,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)
 
   #####################
   #                   #
@@ -290,8 +304,6 @@ parameters:
     type: string
   portal_repo:
     type: string
-  robot_repo:
-    type: string
   sdc_repo:
     type: string
   sdnc_repo:
@@ -321,8 +333,6 @@ parameters:
 
   aai_docker:
     type: string
-  aai_sparky_docker:
-    type: string
   appc_docker:
     type: string
   so_docker:
@@ -406,6 +416,8 @@ parameters:
     type: string
   robot_docker:
     type: string
+  sniro_docker:
+    type: string
   sdc_docker:
     type: string
   sdc_wfd_docker:
@@ -432,7 +444,11 @@ parameters:
     type: string
   music_docker:
     type: string
-  oof_docker:
+  cassandra_music_docker:
+    type: string
+  optf_has_docker:
+    type: string
+  optf_osdf_docker:
     type: string
   aaf_docker:
     type: string
@@ -490,8 +506,6 @@ parameters:
     type: string
   portal_branch:
     type: string
-  robot_branch:
-    type: string
   sdc_branch:
     type: string
   sdnc_branch:
@@ -635,6 +649,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] }
@@ -692,8 +708,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
@@ -736,6 +765,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 }
@@ -744,7 +775,6 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
             __docker_version__: { get_param: aai_docker }
-            __aai_sparky_docker__ : { get_param: aai_sparky_docker }
             __gerrit_branch__: { get_param: aai_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
@@ -762,14 +792,26 @@ resources:
             echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
             echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
             echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__aai_sparky_docker__" > /opt/config/sparky_version.txt
             echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
             echo "aai_instance_1" > /opt/config/aai_instance.txt
             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
@@ -810,6 +852,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 }
@@ -840,8 +884,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
@@ -883,6 +940,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 }
@@ -924,8 +983,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
@@ -967,6 +1039,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 }
@@ -994,8 +1068,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
@@ -1037,6 +1124,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 }
@@ -1048,7 +1137,6 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
             __openstack_region__: { get_param: openstack_region }
             __dns_ip_addr__: { get_param: dns_ip_addr }
-            __gerrit_branch__: { get_param: robot_branch }
             __cloud_env__: { get_param: cloud_env }
             __keystone_url__: { get_param: keystone_url }
             __aai1_ip_addr__: { get_param: aai1_ip_addr }
@@ -1080,8 +1168,8 @@ resources:
             __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: |
@@ -1100,8 +1188,8 @@ 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
             echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
             echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
@@ -1141,12 +1229,24 @@ resources:
             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
             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
@@ -1188,6 +1288,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 }
@@ -1215,8 +1317,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
@@ -1258,6 +1373,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 }
@@ -1287,8 +1404,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
@@ -1339,6 +1469,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 }
@@ -1374,8 +1506,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
@@ -1417,6 +1562,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 }
@@ -1448,8 +1595,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
@@ -1458,7 +1618,6 @@ resources:
             chmod +x portal_install.sh
             ./portal_install.sh
 
-
   # Policy Engine instantiation
   policy_private_port:
     type: OS::Neutron::Port
@@ -1491,6 +1650,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 }
@@ -1520,8 +1681,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
@@ -1563,6 +1737,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 }
@@ -1594,8 +1770,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
@@ -1637,6 +1826,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 }
@@ -1676,8 +1867,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
@@ -1719,6 +1923,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 }
@@ -1821,8 +2027,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
@@ -1868,6 +2087,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 }
@@ -2037,8 +2258,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
@@ -2080,6 +2314,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 }
@@ -2107,8 +2343,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
@@ -2150,13 +2399,18 @@ 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 }
             __nexus_password__: { get_param: nexus_password }
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: oof_docker }
+            __has_docker_version__: { get_param: optf_has_docker }
+            __osdf_docker_version__: { get_param: optf_osdf_docker }
+            __music_docker_version__: { get_param: music_docker }
+            __cass_music_docker_version__: { get_param: cassandra_music_docker }
             __oof_repo__: { get_param: oof_repo }
             __gerrit_branch__: { get_param: oof_branch }
             __cloud_env__: { get_param: cloud_env }
@@ -2172,13 +2426,29 @@ resources:
             echo "__nexus_password__" > /opt/config/nexus_password.txt
             echo "__artifacts_version__" > /opt/config/artifacts_version.txt
             echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
+            echo "__has_docker_version__" > /opt/config/has_docker_version.txt
+            echo "__osdf_docker_version__" > /opt/config/osdf_docker_version.txt
+            echo "__music_docker_version__" > /opt/config/music_version.txt
+            echo "__cass_music_docker_version__" > /opt/config/cass_version.txt
             echo "__oof_repo__" > /opt/config/remote_repo.txt
             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
@@ -2220,6 +2490,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 }
@@ -2249,8 +2521,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
@@ -2291,6 +2576,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 }
@@ -2320,8 +2607,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
@@ -2362,6 +2662,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 }
@@ -2395,8 +2697,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
Demo applications and templates for ONAP platform instantiation.