From 4c41ffee753c3798df7e8ba53af5bbc0e65017d9 Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Wed, 2 Sep 2015 11:48:09 +0100 Subject: [PATCH] Copy config to /etc/kolla rather than symlink in Vagrantfile Symlinking results in all sorts of changes to the repo when going to commit. Also make minor changes resulting from the fact we can now pip install kolla. Change-Id: I6b26fc4635da5293a83cba6edd748b95eea761ca Closes-Bug: #1491312 --- vagrant/bootstrap.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index 9ef6928119..074b752068 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 <