aboutsummaryrefslogtreecommitdiffstats
path: root/bootstrap/vagrant-onap/lib/functions
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2018-01-10 07:20:54 -0800
committerVictor Morales <victor.morales@intel.com>2018-01-10 07:20:54 -0800
commit80f144b8667c256594abc33f48f066331051aea1 (patch)
tree8a90deccf862217233fa4ab6c0c6e4d855aeb485 /bootstrap/vagrant-onap/lib/functions
parent9dad765cfbdfee5c8e4c660c24586a0d7b95ff76 (diff)
Enable ODL
This patch enable the alternative to provision OpenDaylight as a SDN Controller for OpenStack using Kolla as an installer. Change-Id: I4837cc7600cad07600dd5202aa9695ca8b2a8c70 Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-ID: INT-329
Diffstat (limited to 'bootstrap/vagrant-onap/lib/functions')
-rwxr-xr-xbootstrap/vagrant-onap/lib/functions6
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap/vagrant-onap/lib/functions b/bootstrap/vagrant-onap/lib/functions
index 9531fc794..c2c6d76a5 100755
--- a/bootstrap/vagrant-onap/lib/functions
+++ b/bootstrap/vagrant-onap/lib/functions
@@ -141,7 +141,7 @@ function _configure_docker_settings {
local chameleonsocks_filename=chameleonsocks.sh
local max_concurrent_downloads=${1:-3}
- cp $docker_conf $docker_conf_backup
+ cp ${docker_conf} ${docker_conf_backup}
if [ $http_proxy ]; then
echo "export http_proxy=$http_proxy" >> $docker_conf
fi
@@ -156,10 +156,10 @@ function _configure_docker_settings {
port=$(echo $socks_proxy | sed -e "s/^.*://")
PROXY=$socks PORT=$port ./$chameleonsocks_filename --install
rm $chameleonsocks_filename
- cp $docker_conf_backup $docker_conf
+ cp ${docker_conf_backup} ${docker_conf}
fi
fi
- rm $docker_conf_backup
+ rm ${docker_conf_backup}
echo "DOCKER_OPTS=\"-H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock --max-concurrent-downloads $max_concurrent_downloads \"" >> $docker_conf
usermod -aG docker $USER