Code Review / demo.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Add security group to vFW, vLB
[demo.git] / heat / ONAP / onap_openstack.yaml
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 98848c4..bdd505c 100644 (file)
--- 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 #
@@ -294,8 +304,6 @@ parameters:
     type: string
   portal_repo:
     type: string
-  robot_repo:
-    type: string
   sdc_repo:
     type: string
   sdnc_repo:
@@ -325,8 +333,6 @@ parameters:
 
   aai_docker:
     type: string
-  aai_sparky_docker:
-    type: string
   appc_docker:
     type: string
   so_docker:
@@ -500,8 +506,6 @@ parameters:
     type: string
   portal_branch:
     type: string
-  robot_branch:
-    type: string
   sdc_branch:
     type: string
   sdnc_branch:
@@ -575,7 +579,10 @@ resources:
         - protocol: tcp
           port_range_min: 1
           port_range_max: 65535
-
+        # Protocols used for vLB/vDNS use case
+        - protocol: 47
+        - protocol: 53
+        - protocol: 132
 
 
   # ONAP management private network
@@ -631,7 +638,7 @@ resources:
   dns_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_small }
       name:
         str_replace:
@@ -645,6 +652,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] }
@@ -702,8 +711,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
@@ -732,7 +754,7 @@ resources:
     type: OS::Nova::Server
     depends_on: aai2_vm
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_xlarge }
       name:
         str_replace:
@@ -746,6 +768,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 }
@@ -754,7 +778,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 }
@@ -772,14 +795,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
@@ -806,7 +841,7 @@ resources:
   aai2_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_xlarge }
       name:
         str_replace:
@@ -820,6 +855,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 }
@@ -850,8 +887,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
@@ -893,6 +943,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 }
@@ -934,8 +986,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
@@ -963,7 +1028,7 @@ resources:
   mrouter_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_large }
       name:
         str_replace:
@@ -977,6 +1042,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 }
@@ -1004,8 +1071,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
@@ -1047,6 +1127,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 }
@@ -1058,7 +1140,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 }
@@ -1090,7 +1171,6 @@ 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 }
@@ -1113,7 +1193,6 @@ resources:
             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
@@ -1123,6 +1202,7 @@ resources:
             echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
             echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
             echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
+            echo "__policy_ip_addr__" > /opt/config/policy_healthcheck_ip_addr.txt
             echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
             echo "__portal_ip_addr__" > /opt/config/cli_ip_addr.txt
             echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
@@ -1130,12 +1210,15 @@ resources:
             echo "__sdc_be_ip_addr__" > /opt/config/sdc_be_ip_addr.txt
             echo "__sdc_be_onboard_ip_addr__" > /opt/config/sdc_be_onboard_ip_addr.txt
             echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
+            echo "__sdnc_ip_addr__" > /opt/config/sdnc_portal_ip_addr.txt
             echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
             echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt
             echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt
             echo "__openo_ip_addr__" > /opt/config/vnfsdk_ip_addr.txt
             echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt
             echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt
+            echo "__oof_ip_addr__" > /opt/config/oof_homing_ip_addr.txt
+            echo "__oof_ip_addr__" > /opt/config/oof_sniro_ip_addr.txt
             echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt
             echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
@@ -1153,12 +1236,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
@@ -1186,7 +1281,7 @@ resources:
   vid_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_medium }
       name:
         str_replace:
@@ -1200,6 +1295,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 }
@@ -1227,8 +1324,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
@@ -1256,7 +1366,7 @@ resources:
   sdnc_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_large }
       name:
         str_replace:
@@ -1270,6 +1380,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 }
@@ -1299,8 +1411,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
@@ -1351,6 +1476,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 }
@@ -1386,8 +1513,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
@@ -1415,7 +1555,7 @@ resources:
   portal_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_large }
       name:
         str_replace:
@@ -1429,6 +1569,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 }
@@ -1460,8 +1602,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
@@ -1470,7 +1625,6 @@ resources:
             chmod +x portal_install.sh
             ./portal_install.sh
 
-
   # Policy Engine instantiation
   policy_private_port:
     type: OS::Neutron::Port
@@ -1489,7 +1643,7 @@ resources:
   policy_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_xlarge }
       name:
         str_replace:
@@ -1503,6 +1657,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 }
@@ -1532,8 +1688,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
@@ -1561,7 +1730,7 @@ resources:
   appc_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_large }
       name:
         str_replace:
@@ -1575,6 +1744,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 }
@@ -1606,8 +1777,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
@@ -1649,6 +1833,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 }
@@ -1688,8 +1874,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
@@ -1731,6 +1930,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 }
@@ -1833,8 +2034,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
@@ -1880,6 +2094,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 }
@@ -2049,8 +2265,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
@@ -2078,7 +2307,7 @@ resources:
   music_vm:
     type: OS::Nova::Server
     properties:
-      image: { get_param: ubuntu_1404_image }
+      image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_large }
       name:
         str_replace:
@@ -2092,6 +2321,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 }
@@ -2119,8 +2350,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
@@ -2162,6 +2406,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 }
@@ -2195,8 +2441,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
@@ -2238,6 +2497,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 }
@@ -2267,8 +2528,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
@@ -2309,6 +2583,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 }
@@ -2338,8 +2614,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
@@ -2380,6 +2669,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 }
@@ -2413,8 +2704,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.