Added permanent route to Juju controller; chmod +x update-lxd-image; VCA/start_build...

Change-Id: I6aa38a06b75245636877575ad1424161f763f336
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/installers/install_from_source.sh b/installers/install_from_source.sh
index 5f483cd..63c986f 100755 (executable)
--- a/installers/install_from_source.sh
+++ b/installers/install_from_source.sh
@@ -150,6 +150,7 @@ function configure(){
 
     echo -e "       Configuring SO"
     sudo route add -host $JUJU_CONTROLLER_IP gw $VCA_CONTAINER_IP
+    sudo sed -i "$iroute add -host \$JUJU_CONTROLLER_IP gw \$VCA_CONTAINER_IP" /etc/rc.local
     lxc exec SO-ub -- nohup sudo -b -H /usr/rift/rift-shell -r -i /usr/rift -a /usr/rift/.artifacts -- ./demos/launchpad.py --use-xml-mode &
     time=0; step=30; timelength=300; while [ $time -le $timelength ]; do sleep $step; echo -n "."; time=$((time+step)); done; echo
 

diff --git a/jenkins/VCA/start_build b/jenkins/VCA/start_build
index 21d432c..45b0e94 100755 (executable)
--- a/jenkins/VCA/start_build
+++ b/jenkins/VCA/start_build
@@ -26,6 +26,7 @@ apt-get update
 apt-get install -y juju lxd squid-deb-proxy
 
 echo 'streams.canonical' > /etc/squid-deb-proxy/mirror-dstdomain.acl.d/20-juju-streams
+service squid-deb-proxy reload
 
 INFO "Configuring LXD"
 # ZFS doesn't work inside a nested container. ZFS should be configured in the host LXD.

diff --git a/jenkins/VCA/update-lxd-image.sh b/jenkins/VCA/update-lxd-image.sh
old mode 100644 (file)
new mode 100755 (executable)