X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FOpenECOMP%2Fopenecomp_rackspace.yaml;h=fa25ac458d77f3081934bf9b3369b1403e39e66b;hb=2b556b22a1c446670a9e7f7030b24da136dbf45b;hp=1b4ab036fb18f9abec4911da408c7fef8413a823;hpb=ef9a9786fd6dc4a4654203e263b68c0da8e001ae;p=demo.git

diff --git a/heat/OpenECOMP/openecomp_rackspace.yaml b/heat/OpenECOMP/openecomp_rackspace.yaml
index 1b4ab036..fa25ac45 100644
--- a/heat/OpenECOMP/openecomp_rackspace.yaml
+++ b/heat/OpenECOMP/openecomp_rackspace.yaml
@@ -178,11 +178,6 @@ resources:
         str_replace:
           params:
             __nexus_repo__: { get_param: nexus_repo }
-            __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 }
           template: |
             #!/bin/bash
@@ -288,6 +283,7 @@ resources:
             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
+            
             # Execute docker instructions
             cd /opt
             ./aai_vm_init.sh
@@ -495,6 +491,7 @@ resources:
             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
+            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
@@ -530,6 +527,7 @@ resources:
             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
 
             # Execute RobotETE-specific instructions: create share folder to run as a docker volume
             mkdir -p /opt/eteshare/logs
@@ -746,6 +744,7 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
           template: |
             #!/bin/bash
+            
             # DNS/GW IP address configuration
             mkdir /opt/config
             echo "10.0.0.1" > /opt/config/dns_gw_ip.txt
@@ -792,6 +791,7 @@ resources:
             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
 
             # Run SDC-specific instructions
             cd /opt
@@ -856,6 +856,7 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
           template: |
             #!/bin/bash
+            
             # DNS/GW IP address configuration
             mkdir /opt/config
             echo "10.0.0.1" > /opt/config/dns_gw_ip.txt
@@ -945,6 +946,7 @@ resources:
             __openstack_region__: { get_param: openstack_region }
           template: |
             #!/bin/bash
+            
             # DNS/GW IP address configuration
             echo "nameserver 10.0.0.1" >> /etc/resolvconf/resolv.conf.d/head
             resolvconf -u
@@ -982,7 +984,7 @@ resources:
             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__
@@ -1058,6 +1060,7 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
           template: |
             #!/bin/bash
+            
             # DNS/GW IP address configuration
             mkdir /opt/config
             echo "10.0.0.1" > /opt/config/dns_gw_ip.txt