aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-02 15:10:33 +0000
committerGerrit Code Review <review@openstack.org>2015-09-02 15:10:33 +0000
commitc1fb5930c17d4d8d6b94a592a0591ed931c41020 (patch)
tree402c7228fb57127bded8cc5a9c17e8f274cab589
parent7b0d19e9e4b6709ff14f77fa2567ac047a905f73 (diff)
parent4c41ffee753c3798df7e8ba53af5bbc0e65017d9 (diff)
downloadkolla-c1fb5930c17d4d8d6b94a592a0591ed931c41020.tar.gz
kolla-c1fb5930c17d4d8d6b94a592a0591ed931c41020.zip
Merge "Copy config to /etc/kolla rather than symlink in Vagrantfile"
-rw-r--r--vagrant/bootstrap.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh
index 9ef692811..074b75206 100644
--- a/vagrant/bootstrap.sh
+++ b/vagrant/bootstrap.sh
@@ -17,7 +17,7 @@ function prepwork {
yum install -y http://mirror.nl.leaseweb.net/epel/7/x86_64/e/epel-release-7-5.noarch.rpm
yum install -y MySQL-python vim-enhanced python-pip python-devel gcc openssl-devel libffi-devel libxml2-devel libxslt-devel && yum clean all
- pip install --upgrade docker-py shade
+ pip install --upgrade docker-py
}
# Install and configure a quick&dirty docker daemon.
@@ -58,7 +58,7 @@ function configureoperator {
if [ ! -d ~vagrant/kolla ]; then
su - vagrant sh -c "https_proxy=$https_proxy git clone https://github.com/stackforge/kolla.git ~/kolla"
- pip install -r ~vagrant/kolla/requirements.txt
+ pip install ~vagrant/kolla
fi
# Note: this trickery requires a patched docker binary.
@@ -66,8 +66,8 @@ function configureoperator {
su - vagrant sh -c "echo BUILDFLAGS=\\\"--build-env=http_proxy=$http_proxy --build-env=https_proxy=$https_proxy\\\" > ~/kolla/.buildconf"
fi
- ln -sf ~vagrant/kolla/etc/kolla/ /etc/kolla
- ln -sf ~vagrant/kolla/etc/kolla/ /usr/share/kolla
+ cp -r ~vagrant/kolla/etc/kolla/ /etc/kolla
+ chown -R vagrant: /etc/kolla
# Make sure Ansible uses scp.
cat > ~vagrant/.ansible.cfg <<EOF