X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.yaml;h=f9c2528fbc3d4a9eb9fcbbec62ad541f4b8131fc;hb=d9dddf18c7069718f8087ad6490d5d9fb9d6bbd5;hp=11ce2a06e8c25506e7dfd64ef11c04b82e1c2332;hpb=c257cc411773f2b91fcdcebd35c8c30f4f356156;p=demo.git

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 11ce2a06..f9c2528f 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -72,10 +72,6 @@ parameters:
     type: string
     description: Name of the Extra Large Flavor supported by the cloud provider
 
-  flavor_xxlarge:
-    type: string
-    description: Name of the Extra Extra Large Flavor supported by the cloud provider
-
   vm_base_name:
     type: string
     description: Base name of ONAP VMs
@@ -88,9 +84,10 @@ parameters:
     type: string
     description: Public key to be installed on the compute instance
 
-  nexus_repo:
+  nexus_artifact_repo:
     type: string
-    description: Complete URL for the Nexus repository.
+    description: Complete URL for the Nexus repository for Maven artifacts.
+    default: "https://nexus.onap.org"
 
   nexus_docker_repo:
     type: string
@@ -132,10 +129,6 @@ parameters:
     type: string
     description: OpenStack password or API Key
 
-  horizon_url:
-    type: string
-    description: URL of OpenStack Horizon
-
   keystone_url:
     type: string
     description: URL of OpenStack Keystone
@@ -225,51 +218,63 @@ parameters:
 
   dcae_deployment_profile:
     type: string
-    description: DCAE deployment profile.  Currently supported profiles R1, R2MVP.
+    default: R2
+    description: DCAE deployment profile.  Currently supported profiles R2, R2MVP, and R2PLUS.
 
   dnsaas_config_enabled:
     type: string
-    description: whether the DNSaaS configuration section is enabled
+    default: ""
+    description: (deprecated in R2) whether the DNSaaS configuration section is enabled
 
   dnsaas_region:
     type: string
-    description: the region of the cloud instance providing the Designate DNS as a Service
+    default: ""
+    description: (deprecated in R2) the region of the cloud instance providing the Designate DNS as a Service
 
   dnsaas_keystone_url:
     type: string
-    description: the keystone URL of the cloud instance providing the Designate DNS as a Service
+    default: ""
+    description: (deprecated in R2) the keystone URL of the cloud instance providing the Designate DNS as a Service
 
   dnsaas_username:
     type: string
-    description: the username of the cloud instance providing the Designate DNS as a Service
+    default: ""
+    description: (deprecated in R2) the username of the cloud instance providing the Designate DNS as a Service
 
   dnsaas_password:
     type: string
-    description: the password of the cloud instance providing the Designate DNS as a Service
+    default: ""
+    description: (deprecated in R2) the password of the cloud instance providing the Designate DNS as a Service
 
   dnsaas_tenant_name:
     type: string
-    description: the name of the tenant in the cloud instance providing the Designate DNS as a Service
+    default: ""
+    description: (deprecated in R2) the name of the tenant in the cloud instance providing the Designate DNS as a Service
 
   dcae_keystone_url:
     type: string
-    description: the keystone URL for DCAE to use (via MultiCloud)
+    default: ""
+    description: (deprecated in R2) the keystone URL for DCAE to use (via MultiCloud)
 
   dcae_private_key:
     type: string
-    description: the private key of the key-apir used between the DCAE bootstrap container and DCAE VMs
+    default: ""
+    description: (deprecated in R2) the private key of the key-apir used between the DCAE bootstrap container and DCAE VMs
 
   dcae_public_key:
     type: string
-    description: the prublic key of the key-apir used between the DCAE bootstrap container and DCAE VMs
+    default: ""
+    description: (deprecated in R2) the prublic key of the key-apir used between the DCAE bootstrap container and DCAE VMs
 
   dcae_centos_7_image:
     type: string
-    description: the id/name of the CentOS 7 VM imange
+    default: ""
+    description: (deprecated in R2) the id/name of the CentOS 7 VM imange
 
   dcae_domain:
     type: string
-    description: the top level domain to register DCAE VMs (the zone will be random-str.dcae_domain)
+    default: ""
+    description: (deprecated in R2) the top level domain to register DCAE VMs (the zone will be random-str.dcae_domain)
 
   #####################
   #                   #
@@ -320,8 +325,6 @@ parameters:
 
   aai_docker:
     type: string
-  aai_sparky_docker:
-    type: string
   appc_docker:
     type: string
   so_docker:
@@ -405,6 +408,8 @@ parameters:
     type: string
   robot_docker:
     type: string
+  sniro_docker:
+    type: string
   sdc_docker:
     type: string
   sdc_wfd_docker:
@@ -431,7 +436,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
@@ -634,7 +643,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __artifacts_version__: { get_param: artifacts_version }
             __oam_network_cidr__: { get_attr: [oam_onap_subnet, cidr] }
             __dns_ip_addr__: { get_param: dns_ip_addr }
@@ -665,7 +674,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__artifacts_version__" > /opt/config/artifacts_version.txt
             echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
@@ -693,7 +702,10 @@ resources:
             echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dns_install.sh -o /opt/dns_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt dns_install.sh
             cd /opt
             chmod +x dns_install.sh
             ./dns_install.sh
@@ -732,7 +744,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -740,7 +752,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 }
@@ -750,7 +761,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -758,7 +769,6 @@ 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
@@ -766,7 +776,10 @@ resources:
             echo "__aai_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt aai_install.sh
             cd /opt
             chmod +x aai_install.sh
             ./aai_install.sh
@@ -803,7 +816,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -820,7 +833,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -835,7 +848,10 @@ resources:
             echo "__aai_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt aai_install.sh
             cd /opt
             chmod +x aai_install.sh
             ./aai_install.sh
@@ -873,7 +889,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -896,7 +912,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -916,7 +932,10 @@ resources:
             echo "__so_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/so_install.sh -o /opt/so_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt so_install.sh
             cd /opt
             chmod +x so_install.sh
             ./so_install.sh
@@ -954,7 +973,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -970,7 +989,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -983,7 +1002,10 @@ resources:
             echo "__dbcl_docker__" > /opt/config/docker_version.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt mr_install.sh
             cd /opt
             chmod +x mr_install.sh
             ./mr_install.sh
@@ -1021,7 +1043,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1066,6 +1088,7 @@ resources:
             __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: |
@@ -1074,7 +1097,7 @@ resources:
             # Create configuration files
             mkdir -p /opt/config
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
             echo "__network_name__" > /opt/config/network.txt
@@ -1084,6 +1107,7 @@ resources:
             echo "__openstack_region__" > /opt/config/region.txt
             echo "__artifacts_version__" > /opt/config/artifacts_version.txt
             echo "__docker_version__" > /opt/config/docker_version.txt
+            echo "__sniro_docker_version__" > /opt/config/sniro_docker_version.txt
             echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
             echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
             echo "__keystone_url__" > /opt/config/keystone.txt
@@ -1131,7 +1155,10 @@ resources:
             echo "localhost" > /opt/config/log_kibana_ip_addr.txt # these tests will be skipped by robot
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/robot_install.sh -o /opt/robot_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt robot_install.sh
             cd /opt
             chmod +x robot_install.sh
             ./robot_install.sh
@@ -1169,7 +1196,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1185,7 +1212,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -1198,7 +1225,10 @@ resources:
             echo "__vid_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/vid_install.sh -o /opt/vid_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt vid_install.sh
             cd /opt
             chmod +x vid_install.sh
             ./vid_install.sh
@@ -1236,7 +1266,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1253,7 +1283,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -1267,7 +1297,10 @@ resources:
             echo "__sdnc_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdnc_install.sh -o /opt/sdnc_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt sdnc_install.sh
             cd /opt
             chmod +x sdnc_install.sh
             ./sdnc_install.sh
@@ -1314,7 +1347,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1334,7 +1367,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -1351,7 +1384,10 @@ resources:
             echo "__sdc_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdc_install.sh -o /opt/sdc_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt sdc_install.sh
             cd /opt
             chmod +x sdc_install.sh
             ./sdc_install.sh
@@ -1389,7 +1425,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1407,7 +1443,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -1422,7 +1458,10 @@ resources:
             echo "__portal_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/portal_install.sh -o /opt/portal_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt portal_install.sh
             cd /opt
             chmod +x portal_install.sh
             ./portal_install.sh
@@ -1460,7 +1499,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1477,7 +1516,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -1491,7 +1530,10 @@ resources:
             echo "__policy_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/policy_install.sh -o /opt/policy_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt policy_install.sh
             cd /opt
             chmod +x policy_install.sh
             ./policy_install.sh
@@ -1529,7 +1571,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1547,7 +1589,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -1562,7 +1604,10 @@ resources:
             echo "__appc_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt appc_install.sh
             cd /opt
             chmod +x appc_install.sh
             ./appc_install.sh
@@ -1600,7 +1645,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1622,7 +1667,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -1641,7 +1686,10 @@ resources:
             echo "__clamp_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt clamp_install.sh
             cd /opt
             chmod +x clamp_install.sh
             ./clamp_install.sh
@@ -1679,7 +1727,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1731,7 +1779,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -1783,7 +1831,10 @@ resources:
             echo "export OPENO_IP=__openo_ip_addr__" >> /opt/config/onap_ips.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/openo_install.sh -o /opt/openo_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt openo_install.sh
             cd /opt
             chmod +x openo_install.sh
             ./openo_install.sh
@@ -1827,7 +1878,7 @@ resources:
             # repo related
             __artifacts_version__: { get_param: artifacts_version }
             __docker_version__: { get_param: dcae_docker }
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1918,7 +1969,7 @@ resources:
             # repo related
             echo "__docker_version__" > /opt/config/docker_version.txt
             echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -1996,7 +2047,10 @@ resources:
             echo "__holmes_rm_docker__" > /opt/config/holmes_docker_rm.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae2_install.sh -o /opt/dcae2_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt dcae2_install.sh
             cd /opt
             chmod +x dcae2_install.sh
             ./dcae2_install.sh > /tmp/dcae2_install.log 2>&1
@@ -2034,7 +2088,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -2050,7 +2104,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -2063,7 +2117,10 @@ resources:
             echo "__external_dns__" > /opt/config/external_dns.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/music_install.sh -o /opt/music_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt music_install.sh
             cd /opt
             chmod +x music_install.sh
             ./music_install.sh
@@ -2101,13 +2158,16 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
             __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 }
@@ -2117,20 +2177,26 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
             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
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/oof_install.sh -o /opt/oof_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt oof_install.sh
             cd /opt
             chmod +x oof_install.sh
             ./oof_install.sh
@@ -2168,7 +2234,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -2185,7 +2251,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -2199,7 +2265,10 @@ resources:
             echo "__local_ip__" > /opt/config/local_ip.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aaf_install.sh -o /opt/aaf_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt aaf_install.sh
             cd /opt
             chmod +x aaf_install.sh
             ./aaf_install.sh
@@ -2236,7 +2305,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -2253,7 +2322,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -2267,7 +2336,10 @@ resources:
             echo "__local_ip__" > /opt/config/local_ip.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sms_install.sh -o /opt/sms_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt sms_install.sh
             cd /opt
             chmod +x sms_install.sh
             ./sms_install.sh
@@ -2304,7 +2376,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -2323,7 +2395,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -2339,7 +2411,10 @@ resources:
             echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/nbi_install.sh -o /opt/nbi_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt nbi_install.sh
             cd /opt
             chmod +x nbi_install.sh
             ./nbi_install.sh