diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-23 18:27:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-23 18:27:43 +0000 |
| commit | 3f8bc072706dc7dfb064ea37813dc2ccc3d87e31 (patch) | |
| tree | c18ea9fdabf401e24797e5b77910950460904f88 /dev/vagrant/centos-bootstrap.sh | |
| parent | 22d32ff280ca0e69c66dd774cf793acfa16ae2df (diff) | |
| parent | aaa38eaf5b9d36d59b4e6eb72fdd11764d19cee9 (diff) | |
| download | kolla-3f8bc072706dc7dfb064ea37813dc2ccc3d87e31.tar.gz kolla-3f8bc072706dc7dfb064ea37813dc2ccc3d87e31.zip | |
Merge "Fix vagrant bootstrapping for ubuntu"
Diffstat (limited to 'dev/vagrant/centos-bootstrap.sh')
| -rw-r--r-- | dev/vagrant/centos-bootstrap.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dev/vagrant/centos-bootstrap.sh b/dev/vagrant/centos-bootstrap.sh index 2555eb479..d73c130d7 100644 --- a/dev/vagrant/centos-bootstrap.sh +++ b/dev/vagrant/centos-bootstrap.sh @@ -40,7 +40,7 @@ function prep_work { # Install and configure a quick&dirty docker daemon. function install_docker { # Allow for an externally supplied docker binary. - if [ -f "/data/docker" ]; then + if [[ -f "/data/docker" ]]; then cp /vagrant/docker /usr/bin/docker chmod +x /usr/bin/docker else @@ -90,7 +90,7 @@ function configure_operator { pip install ~vagrant/kolla # Note: this trickery requires a patched docker binary. - if [ "$http_proxy" = "" ]; then + if [[ "$http_proxy" = "" ]]; then su - vagrant sh -c "echo BUILDFLAGS=\\\"--build-env=http_proxy=$http_proxy --build-env=https_proxy=$https_proxy\\\" > ~/kolla/.buildconf" fi @@ -136,7 +136,6 @@ EOF # Launch a local registry (and mirror) to speed up pulling images. - # 0.9.1 is actually the _latest_ tag. if [[ ! $(docker ps -a -q -f name=registry) ]]; then docker run -d \ --name registry \ @@ -154,6 +153,6 @@ EOF prep_work install_docker -if [ "$VM" = "operator" ]; then +if [[ "$VM" = "operator" ]]; then configure_operator fi |
