diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-01-12 20:05:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-01-12 20:05:58 +0000 |
| commit | d448c2d199e626283a8e58e486a4b8eebbf401fa (patch) | |
| tree | e659f189637bfc85cd69b91f7dbc5bb0a9a632cb /bootstrap/vagrant-onap/lib/functions | |
| parent | f422ab8b4e907d9240b3d30b70431665ff8ec738 (diff) | |
| parent | 80f144b8667c256594abc33f48f066331051aea1 (diff) | |
Merge "Enable ODL"
Diffstat (limited to 'bootstrap/vagrant-onap/lib/functions')
| -rwxr-xr-x | bootstrap/vagrant-onap/lib/functions | 6 |
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 |