diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-08-01 12:02:37 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-08-02 13:11:23 -0700 |
| commit | 2845d14cf5ff67a1e22600cb5eacb5fd988473e4 (patch) | |
| tree | fc36c2bfd2b38155e1416e4669b0d424d2efc534 | |
| parent | ffd526656aad91b3bf165eea90bc158b3dc3e4fd (diff) | |
Support cloud-config scripts in HEAT template
Change-Id: I4deb3a3815885216646ce3d799289c585ba23666
Issue-ID: INT-605
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
| -rwxr-xr-x | test/ete/labs/gwu/apt-proxy.sh | 2 | ||||
| -rwxr-xr-x | test/ete/labs/huawei/apt-proxy.sh | 2 | ||||
| -rwxr-xr-x | test/ete/labs/tlab/apt-proxy.sh | 2 | ||||
| -rwxr-xr-x | test/ete/labs/windriver/apt-proxy.sh | 2 | ||||
| -rwxr-xr-x | test/ete/scripts/deploy-onap.sh | 1 |
5 files changed, 5 insertions, 4 deletions
diff --git a/test/ete/labs/gwu/apt-proxy.sh b/test/ete/labs/gwu/apt-proxy.sh index 74a180bd0..b2d5d1f01 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 6fec3d03e..1e2ccd6c2 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 3cf547452..9203844fc 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 365b5d015..13c8221b4 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 b4d653931..aa3502163 100755 --- a/test/ete/scripts/deploy-onap.sh +++ b/test/ete/scripts/deploy-onap.sh @@ -28,6 +28,7 @@ fi 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 |