X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FOpenECOMP%2Fopenecomp_rackspace.yaml;h=f5431276c8240b39a4f39b9ad660c65bed2a2ca1;hb=7ffc784e98f5f608000d1deff778e5aa1496a4fc;hp=11c11262701643d6464baf254158a444f37ab012;hpb=ffac8c3daab6211f0b6988404990c17a8a108f16;p=demo.git

diff --git a/heat/OpenECOMP/openecomp_rackspace.yaml b/heat/OpenECOMP/openecomp_rackspace.yaml
index 11c11262..f5431276 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
@@ -530,6 +526,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 +743,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
@@ -777,7 +775,7 @@ resources:
             chmod +x /opt/docker/docker-compose
 
             # Create partition and mount the external volume
-            curl --user '__nexus_username__:__nexus_password__' __nexus_repo__/org.openecomp.boot/asdc_ext_volume_partitions.txt -o /opt/asdc_ext_volume_partitions.txt
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/asdc_ext_volume_partitions.txt -o /opt/asdc_ext_volume_partitions.txt
             sfdisk /dev/xvdb < /opt/asdc_ext_volume_partitions.txt
             mkfs -t ext4 /dev/xvdb1
             mkdir -p /data
@@ -792,6 +790,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
@@ -799,9 +798,9 @@ resources:
             mkdir -p /data/scripts
             mkdir -p /data/logs/BE
             mkdir -p /data/logs/FE
-            chmod 775 /data
-            chmod 775 /data/logs/BE
-            chmod 775 /data/logs/FE
+            chmod 777 /data
+            chmod 777 /data/logs/BE
+            chmod 777 /data/logs/FE
 
             git clone https://__gitlab_username__:__gitlab_password__@gerrit.openecomp.org/r/a/sdc.git
 
@@ -856,6 +855,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 +945,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
@@ -1058,6 +1059,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