Support cloud-config scripts in HEAT template
Change-Id: I4deb3a3815885216646ce3d799289c585ba23666
Issue-ID: INT-605
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
diff --git a/test/ete/labs/gwu/apt-proxy.sh b/test/ete/labs/gwu/apt-proxy.sh
index 74a180b..b2d5d1f 100755
--- a/test/ete/labs/gwu/apt-proxy.sh
+++ b/test/ete/labs/gwu/apt-proxy.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-sed -i '/#!\/bin\/bash/a\
+sed -i '/^ #!\/bin\/bash/a\
# sleep up to 3 minutes to avoid disk contention\
sleep $((RANDOM / 200))\
mkdir -p /etc/docker\
diff --git a/test/ete/labs/huawei/apt-proxy.sh b/test/ete/labs/huawei/apt-proxy.sh
index 6fec3d0..1e2ccd6 100755
--- a/test/ete/labs/huawei/apt-proxy.sh
+++ b/test/ete/labs/huawei/apt-proxy.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-sed -i '/#!\/bin\/bash/a\
+sed -i '/^ #!\/bin\/bash/a\
mkdir -p /etc/docker\
cat > /etc/docker/daemon.json <<EOF\
{\
diff --git a/test/ete/labs/tlab/apt-proxy.sh b/test/ete/labs/tlab/apt-proxy.sh
index 3cf5474..9203844 100755
--- a/test/ete/labs/tlab/apt-proxy.sh
+++ b/test/ete/labs/tlab/apt-proxy.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-sed -i '/#!\/bin\/bash/a\
+sed -i '/^ #!\/bin\/bash/a\
mkdir -p /etc/docker\
cat > /etc/docker/daemon.json <<EOF\
{\
diff --git a/test/ete/labs/windriver/apt-proxy.sh b/test/ete/labs/windriver/apt-proxy.sh
index 365b5d0..13c8221 100755
--- a/test/ete/labs/windriver/apt-proxy.sh
+++ b/test/ete/labs/windriver/apt-proxy.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-sed -i '/#!\/bin\/bash/a\
+sed -i '/^ #!\/bin\/bash/a\
mkdir -p /etc/docker\
cat > /etc/docker/daemon.json <<EOF\
{\
diff --git a/test/ete/scripts/deploy-onap.sh b/test/ete/scripts/deploy-onap.sh
index b4d6539..aa35021 100755
--- a/test/ete/scripts/deploy-onap.sh
+++ b/test/ete/scripts/deploy-onap.sh
@@ -28,6 +28,7 @@
SENTINEL='Docker versions and branches'
mkdir -p ${LAB_DIR}/target
+rsync -avt $DEMO_DIR/heat/ONAP/ ${LAB_DIR}/target/
YAML_FILE=${LAB_DIR}/target/onap_openstack.yaml
ENV_FILE=${LAB_DIR}/target/onap_openstack.env
YAML_SRC=${DEMO_DIR}/heat/ONAP/onap_openstack.yaml