diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2015-09-02 11:48:09 +0100 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2015-09-02 11:48:09 +0100 |
| commit | 4c41ffee753c3798df7e8ba53af5bbc0e65017d9 (patch) | |
| tree | b0771a5d0e7fec55bf5711e8534d3fedcb5f3205 | |
| parent | 34937175172e44ed67d271f74540b7f5e0de7c6d (diff) | |
| download | kolla-4c41ffee753c3798df7e8ba53af5bbc0e65017d9.tar.gz kolla-4c41ffee753c3798df7e8ba53af5bbc0e65017d9.zip | |
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
| -rw-r--r-- | vagrant/bootstrap.sh | 8 |
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 |