diff options
| author |   Marco Platania <platania@research.att.com> | 2017-10-30 13:25:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-30 13:25:30 +0000 |
| commit | faf20e9b88fd93a18d70883fc3dcef7b3a8b64d1 (patch) | |
| tree | 90cd5b0dc16d794c12cf00e7d3c20d06af23c6de | |
| parent | 4597e1988ef3f64c2fbf1b1230f0acbc43030315 (diff) | |
| parent | 5854574e93495d520456e18352e130d353c2c200 (diff) | |
Merge "Deploy latest demo/heat in robot VM"
| -rw-r--r-- | boot/robot_install.sh | 2 | ||||
| -rw-r--r-- | boot/robot_vm_init.sh | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/boot/robot_install.sh b/boot/robot_install.sh index 70cf4b14..b17e9fc7 100644 --- a/boot/robot_install.sh +++ b/boot/robot_install.sh @@ -8,6 +8,7 @@ CLOUD_ENV=$(cat /opt/config/cloud_env.txt) GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) CODE_REPO=$(cat /opt/config/remote_repo.txt) +HEAT_CODE_REPO=http://gerrit.onap.org/r/demo.git # Short-term fix to get around MSO to SO name change cp /opt/config/so_ip_addr.txt /opt/config/mso_ip_addr.txt @@ -99,6 +100,7 @@ mkdir -p /opt/eteshare/logs mkdir -p /opt/eteshare/config cd /opt git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO testsuite/properties +git clone -b $GERRIT_BRANCH --single-branch $HEAT_CODE_REPO demo # Rename network interface in openstack Ubuntu 16.04 images. Then, reboot the VM to pick up changes if [[ $CLOUD_ENV != "rackspace" ]] diff --git a/boot/robot_vm_init.sh b/boot/robot_vm_init.sh index c119dde8..aca28f5b 100644 --- a/boot/robot_vm_init.sh +++ b/boot/robot_vm_init.sh @@ -17,6 +17,13 @@ cp vm_config2robot.sh /opt/eteshare/config cp ete.sh /opt cp demo.sh /opt +# +# Deploy latest heat templates +# +cd /opt/demo +git pull +cp -rf heat /opt/eteshare + #if [[ $CLOUD_ENV != "rackspace" ]] #then # sed -i "s/10.0.1.1/"$(cat /opt/config/aai1_ip_addr.txt)"/g" /opt/eteshare/config/integration_robot_properties.py |