X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FOpenECOMP%2Fopenecomp_rackspace.yaml;h=8a30bbc09b3b2652000b60c0b7b7c1d22764efcd;hb=refs%2Fheads%2Frelease-1.0.0;hp=4e75bde02fc9cc45b4f840d24358e74959e584e4;hpb=c82c2a1626a5d5e2da2bc0a0093a949cf65e8af6;p=demo.git

diff --git a/heat/OpenECOMP/openecomp_rackspace.yaml b/heat/OpenECOMP/openecomp_rackspace.yaml
index 4e75bde0..489422e0 100644
--- a/heat/OpenECOMP/openecomp_rackspace.yaml
+++ b/heat/OpenECOMP/openecomp_rackspace.yaml
@@ -1,10 +1,10 @@
 heat_template_version: 2013-05-23
 
-description: Heat template to deploy OpenECOMP components
+description: Heat template to deploy ONAP components
 
 parameters:
 
-  # Generic parameters used across all OpenECOMP components
+  # Generic parameters used across all ONAP components
   public_net_id:
     type: string
     label: Public network name or ID
@@ -39,16 +39,6 @@ parameters:
     type: string
     label: Nexus Repository Password
     description: Nexus Repository Password
-    
-  gitlab_username:
-    type: string
-    label: Gitlab Repository Username
-    description: Gitlab Repository username
-
-  gitlab_password:
-    type: string
-    label: Gitlab Repository Password
-    description: Gitlab Repository Password
 
   dmaap_topic:
     type: string
@@ -58,8 +48,17 @@ parameters:
   artifacts_version:
     type: string
     label: Artifacts Version
-    description: Artifacts version of OpenECOMP components
+    description: Artifacts version of ONAP components
+    
+  docker_version:
+    type: string
+    label: Docker Version
+    description: Docker version of ONAP docker images
 
+  gerrit_branch:
+    type: string
+    label: Gerrit code branch
+    description: Gerrit branch where to download the code from
 
   # Parameters for DCAE instantiation
   dcae_zone:
@@ -119,7 +118,7 @@ resources:
     properties:
       length: 4
 
-  # Public key used to access OpenECOMP components
+  # Public key used to access ONAP components
   vm_key:
     type: OS::Nova::KeyPair
     properties:
@@ -133,7 +132,7 @@ resources:
       save_private_key: false
 
 
-  # OpenECOMP management private network
+  # ONAP management private network
   oam_ecomp:
     type: OS::Neutron::Net
     properties:
@@ -153,7 +152,6 @@ resources:
             rand: { get_resource: random-str }
       network_id: { get_resource: oam_ecomp }
       cidr: 10.0.0.0/8
-    value: { get_attr: [oam_ecomp, name] }
 
 
   # DNS Server instantiation
@@ -236,10 +234,9 @@ resources:
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
-            __gitlab_username__: { get_param: gitlab_username }
-            __gitlab_password__: { get_param: gitlab_password }
             __dmaap_topic__: { get_param: dmaap_topic }
             __artifacts_version__: { get_param: artifacts_version }
+            __docker_version__: { get_param: docker_version }
           template: |
             #!/bin/bash
 
@@ -250,7 +247,7 @@ resources:
             # Download dependencies
             add-apt-repository -y ppa:openjdk-r/ppa
             apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk ntp ntpdate
+            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
 
             # Download scripts from Nexus
             curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai_vm_init.sh -o /opt/aai_vm_init.sh
@@ -280,9 +277,7 @@ resources:
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
             echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__gitlab_username__" > /opt/config/gitlab_username.txt
-            echo "__gitlab_password__" > /opt/config/gitlab_password.txt
-            echo "gerrit.openecomp.org" > /opt/config/gitlab_certname.txt
+            echo "__docker_version__" > /opt/config/docker_version.txt
             
             # Execute docker instructions
             cd /opt
@@ -314,13 +309,13 @@ resources:
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
-            __gitlab_username__: { get_param: gitlab_username }
-            __gitlab_password__: { get_param: gitlab_password }
             __openstack_username__: { get_param: openstack_username }
             __openstack_tenant_id__: { get_param: openstack_tenant_id }
             __openstack_api_key__: { get_param: openstack_api_key }
             __dmaap_topic__: { get_param: dmaap_topic }
             __artifacts_version__: { get_param: artifacts_version }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
           template: |
             #!/bin/bash
 
@@ -358,16 +353,14 @@ resources:
             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 "__gitlab_username__" > /opt/config/gitlab_username.txt
-            echo "__gitlab_password__" > /opt/config/gitlab_password.txt
             echo "__openstack_username__" > /opt/config/openstack_username.txt
             echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt
             echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-           
+            echo "__docker_version__" > /opt/config/docker_version.txt
 
             # Run docker-compose to spin up containers
             cd /opt
-            git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/mso/docker-config.git test_lab
+            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/mso/docker-config.git test_lab
             MSO_ENCRYPTION_KEY=$(cat /opt/test_lab/encryption.key)
             echo -n "__openstack_api_key__" | openssl aes-128-ecb -e -K $MSO_ENCRYPTION_KEY -nosalt | xxd -c 256 -p > /opt/config/api_key.txt
             ./mso_vm_init.sh
@@ -398,9 +391,8 @@ resources:
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
-            __gitlab_username__: { get_param: gitlab_username }
-            __gitlab_password__: { get_param: gitlab_password }
             __artifacts_version__: { get_param: artifacts_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
           template: |
             #!/bin/bash
 
@@ -411,7 +403,7 @@ resources:
             # Download dependencies
             add-apt-repository -y ppa:openjdk-r/ppa
             apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk ntp ntpdate
+            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
             
             # Download scripts from Nexus
             curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mr_vm_init.sh -o /opt/mr_vm_init.sh
@@ -438,12 +430,10 @@ resources:
             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 "__gitlab_username__" > /opt/config/gitlab_username.txt
-            echo "__gitlab_password__" > /opt/config/gitlab_password.txt
 
             # Run docker-compose to spin up containers
             cd /opt
-            git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/dcae/demo/startup/message-router.git dcae-startup-vm-message-router
+            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/dcae/demo/startup/message-router.git dcae-startup-vm-message-router
             ./mr_vm_init.sh
 
 
@@ -472,14 +462,14 @@ resources:
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
-            __gitlab_username__: { get_param: gitlab_username }
-            __gitlab_password__: { get_param: gitlab_password }
             __network_name__: { get_attr: [oam_ecomp, name] }
             __openstack_username__: { get_param: openstack_username }
             __openstack_api_key__: { get_param : openstack_api_key }
             __openstack_password__: { get_param: openstack_password }
             __artifacts_version__: { get_param: artifacts_version }
             __openstack_region__: { get_param: openstack_region }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
           template: |
             #!/bin/bash
 
@@ -490,7 +480,8 @@ resources:
             # Download dependencies
             add-apt-repository -y ppa:openjdk-r/ppa
             apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk ntp ntpdate
+            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
+            echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic
 
             # Download scripts from Nexus
             curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/robot_vm_init.sh -o /opt/robot_vm_init.sh
@@ -506,7 +497,6 @@ resources:
             apt-get update
             apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
             apt-get install -y docker-engine
-            #sed -i 's|^ExecStart=/usr/bin/dockerd \s*-H \s*fd://\s*$|ExecStart=/usr/bin/dockerd -H fd:// -H tcp://0.0.0.0:2375|' /lib/systemd/system/docker.service
             service docker start
  
             mkdir /opt/docker
@@ -519,14 +509,13 @@ resources:
             echo "__nexus_repo__" > /opt/config/nexus_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__gitlab_username__" > /opt/config/gitlab_username.txt
-            echo "__gitlab_password__" > /opt/config/gitlab_password.txt
             echo "__network_name__" > /opt/config/network.txt
             echo "__openstack_username__" > /opt/config/openstack_username.txt
             echo "__openstack_password__" > /opt/config/openstack_password.txt
             echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt
             echo "__openstack_region__" > /opt/config/region.txt
             echo "__artifacts_version__" > /opt/config/artifacts_version.txt
+            echo "__docker_version__" > /opt/config/docker_version.txt
 
             # Execute RobotETE-specific instructions: create share folder to run as a docker volume
             mkdir -p /opt/eteshare/logs
@@ -534,7 +523,7 @@ resources:
 
             # Run docker-compose to spin up containers
             cd /opt
-            git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/testsuite/properties.git testsuite/properties
+            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/testsuite/properties.git testsuite/properties
             ./robot_vm_init.sh
 
 
@@ -563,9 +552,9 @@ resources:
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
-            __gitlab_username__: { get_param: gitlab_username }
-            __gitlab_password__: { get_param: gitlab_password }
             __artifacts_version__: { get_param: artifacts_version }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
           template: |
             #!/bin/bash
 
@@ -603,12 +592,11 @@ resources:
             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 "__gitlab_username__" > /opt/config/gitlab_username.txt
-            echo "__gitlab_password__" > /opt/config/gitlab_password.txt
+            echo "__docker_version__" > /opt/config/docker_version.txt
 
             # Run script to spin up containers
             cd /opt
-            git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/vid.git
+            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/vid.git
             ./vid_vm_init.sh
 
 
@@ -637,9 +625,9 @@ resources:
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
-            __gitlab_username__: { get_param: gitlab_username }
-            __gitlab_password__: { get_param: gitlab_password }
             __artifacts_version__: { get_param: artifacts_version }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
           template: |
             #!/bin/bash
 
@@ -652,7 +640,7 @@ resources:
             # Download dependencies
             add-apt-repository -y ppa:openjdk-r/ppa
             apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk ntp ntpdate
+            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
 
             # Download scripts from Nexus
             curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/sdnc_vm_init.sh -o /opt/sdnc_vm_init.sh
@@ -679,12 +667,11 @@ resources:
             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 "__gitlab_username__" > /opt/config/gitlab_username.txt
-            echo "__gitlab_password__" > /opt/config/gitlab_password.txt
+            echo "__docker_version__" > /opt/config/docker_version.txt
 
             # Run docker-compose to spin up containers
             cd /opt
-            git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/sdnc/oam.git sdnc
+            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/sdnc/oam.git sdnc
             ./sdnc_vm_init.sh
 
 
@@ -737,12 +724,13 @@ resources:
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
-            __gitlab_username__: { get_param: gitlab_username }
-            __gitlab_password__: { get_param: gitlab_password }
             __env_name__: { get_param: dmaap_topic }
             __artifacts_version__: { get_param: artifacts_version }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
           template: |
             #!/bin/bash
+            
             # DNS/GW IP address configuration
             mkdir /opt/config
             echo "10.0.0.1" > /opt/config/dns_gw_ip.txt
@@ -752,7 +740,7 @@ resources:
             # Download dependencies
             add-apt-repository -y ppa:openjdk-r/ppa
             apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk ntp ntpdate
+            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
             
             # Download scripts from Nexus
             curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/asdc_vm_init.sh -o /opt/asdc_vm_init.sh
@@ -786,9 +774,9 @@ resources:
             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 "__gitlab_username__" > /opt/config/gitlab_username.txt
-            echo "__gitlab_password__" > /opt/config/gitlab_password.txt
             echo "__env_name__" > /opt/config/env_name.txt
+            echo "10.0.11.1" > /opt/config/mr_ip_addr.txt
+            echo "__docker_version__" > /opt/config/docker_version.txt
 
             # Run SDC-specific instructions
             cd /opt
@@ -800,7 +788,7 @@ resources:
             chmod 777 /data/logs/BE
             chmod 777 /data/logs/FE
 
-            git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/sdc.git
+            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/sdc.git
 
             cat > /root/.bash_aliases << EOF
             alias dcls='/data/scripts/docker_clean.sh \$1'
@@ -848,11 +836,12 @@ resources:
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
-            __gitlab_username__: { get_param: gitlab_username }
-            __gitlab_password__: { get_param: gitlab_password }
             __artifacts_version__: { get_param: artifacts_version }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
           template: |
             #!/bin/bash
+            
             # DNS/GW IP address configuration
             mkdir /opt/config
             echo "10.0.0.1" > /opt/config/dns_gw_ip.txt
@@ -862,7 +851,7 @@ resources:
             # Download dependencies
             add-apt-repository -y ppa:openjdk-r/ppa
             apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk unzip mysql-client-core-5.6 ntp ntpdate
+            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git unzip mysql-client-core-5.6 ntp ntpdate
             
             # Download scripts from Nexus
             curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/portal_vm_init.sh -o /opt/portal_vm_init.sh
@@ -888,13 +877,12 @@ resources:
             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 "__gitlab_username__" > /opt/config/gitlab_username.txt
-            echo "__gitlab_password__" > /opt/config/gitlab_password.txt
+            echo "__docker_version__" > /opt/config/docker_version.txt
 
             # Run Portal-specific instructions
             mkdir -p /PROJECT/OpenSource/UbuntuEP/logs
             cd /opt
-            git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/portal.git
+            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/portal.git
 
             # Run docker-compose to spin up containers
             ./portal_vm_init.sh
@@ -925,8 +913,6 @@ resources:
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
             __nexus_url_snapshots__: { get_param: nexus_url_snapshot }
-            __gitlab_username__: { get_param: gitlab_username }
-            __gitlab_password__: { get_param: gitlab_password }
             __gitlab_branch__: { get_param: gitlab_branch }
             __dcae_zone__: { get_param: dcae_zone }
             __dcae_state__: { get_param: dcae_state }
@@ -940,8 +926,11 @@ resources:
             __pub_key__: { get_param: pub_key }
             __nexus_repo_root__: { get_param: nexus_repo_root }
             __openstack_region__: { get_param: openstack_region }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
           template: |
             #!/bin/bash
+            
             # DNS/GW IP address configuration
             echo "nameserver 10.0.0.1" >> /etc/resolvconf/resolv.conf.d/head
             resolvconf -u
@@ -972,14 +961,14 @@ resources:
             
             # DCAE Controller specific deployment
             cd /opt
-            git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/dcae/demo/startup/controller.git dcae-startup-vm-controller
+            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/dcae/demo/startup/controller.git dcae-startup-vm-controller
 
             cd dcae-startup-vm-controller
             mkdir -p /opt/app/dcae-controller
             cat > /opt/app/dcae-controller/config.yaml << EOF_CONFIG
             ZONE: __dcae_zone__
             STATE: __dcae_state__
-            DCAE-VERSION: 0.1.0-SNAPSHOT
+            DCAE-VERSION: __artifacts_version__
             HORIZON-URL: https://mycloud.rackspace.com/cloud/__tenant_id__
             KEYSTONE-URL: https://identity.api.rackspacecloud.com/v2.0
             OPENSTACK-TENANT-ID: __tenant_id__
@@ -999,7 +988,7 @@ resources:
             
             DOCKER-REGISTRY: __nexus_docker_repo__
 
-            GIT-MR-REPO: https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/dcae/demo/startup/message-router.git
+            GIT-MR-REPO: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git
             EOF_CONFIG
 
             # Store credentials in files
@@ -1007,9 +996,8 @@ resources:
             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 "__gitlab_username__" > /opt/config/gitlab_username.txt
-            echo "__gitlab_password__" > /opt/config/gitlab_password.txt
             echo "__gitlab_branch__" > /opt/config/gitlab_branch.txt
+            echo "__docker_version__" > /opt/config/docker_version.txt
 
             cd /opt
             ./dcae_vm_init.sh
@@ -1050,11 +1038,12 @@ resources:
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
-            __gitlab_username__: { get_param: gitlab_username }
-            __gitlab_password__: { get_param: gitlab_password }
             __artifacts_version__: { get_param: artifacts_version }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
           template: |
             #!/bin/bash
+            
             # DNS/GW IP address configuration
             mkdir /opt/config
             echo "10.0.0.1" > /opt/config/dns_gw_ip.txt
@@ -1064,7 +1053,7 @@ resources:
             # Download dependencies
             add-apt-repository -y ppa:openjdk-r/ppa
             apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk ntp ntpdate
+            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
 
             # Download scripts from Nexus
             curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/policy_vm_init.sh -o /opt/policy_vm_init.sh
@@ -1090,12 +1079,11 @@ resources:
             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 "__gitlab_username__" > /opt/config/gitlab_username.txt
-            echo "__gitlab_password__" > /opt/config/gitlab_password.txt
+            echo "__docker_version__" > /opt/config/docker_version.txt
 
             # Run docker-compose to spin up containers
             cd /opt
-            git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/policy/docker.git policy
+            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/policy/docker.git policy
 
             ./policy_vm_init.sh
 
@@ -1125,10 +1113,10 @@ resources:
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
-            __gitlab_username__: { get_param: gitlab_username }
-            __gitlab_password__: { get_param: gitlab_password }
             __dmaap_topic__: { get_param: dmaap_topic }
             __artifacts_version__: { get_param: artifacts_version }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
           template: |
             #!/bin/bash
 
@@ -1141,7 +1129,7 @@ resources:
             # Download dependencies
             add-apt-repository -y ppa:openjdk-r/ppa
             apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-7-jdk ntp ntpdate
+            apt-get install -y apt-transport-https ca-certificates wget openjdk-7-jdk git ntp ntpdate
 
             # Download scripts from Nexus
             curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/appc_vm_init.sh -o /opt/appc_vm_init.sh
@@ -1168,12 +1156,11 @@ resources:
             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 "__gitlab_username__" > /opt/config/gitlab_username.txt
-            echo "__gitlab_password__" > /opt/config/gitlab_password.txt
             echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
+            echo "__docker_version__" > /opt/config/docker_version.txt
 
             # Run docker-compose to spin up containers
             cd /opt
-            git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/appc/deployment.git appc
+            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/appc/deployment.git appc
             ./appc_vm_init.sh