openstack/kolla-ansible
Code Issues Proposed changes

Copy config to /etc/kolla rather than symlink in Vagrantfile

Browse Source 
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
This commit is contained in:
Paul Bourke 2015-09-02 11:48:09 +01:00
parent 3493717517
commit 4c41ffee75
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vagrant/bootstrap.sh
View File

@ -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 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 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. # Install and configure a quick&dirty docker daemon.
@ -58,7 +58,7 @@ function configureoperator {
if [ ! -d ~vagrant/kolla ]; then if [ ! -d ~vagrant/kolla ]; then
su - vagrant sh -c "https_proxy=$https_proxy git clone https://github.com/stackforge/kolla.git ~/kolla" 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 fi
# Note: this trickery requires a patched docker binary. # 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" su - vagrant sh -c "echo BUILDFLAGS=\\\"--build-env=http_proxy=$http_proxy --build-env=https_proxy=$https_proxy\\\" > ~/kolla/.buildconf"
fi fi
ln -sf ~vagrant/kolla/etc/kolla/ /etc/kolla cp -r ~vagrant/kolla/etc/kolla/ /etc/kolla
ln -sf ~vagrant/kolla/etc/kolla/ /usr/share/kolla chown -R vagrant: /etc/kolla
# Make sure Ansible uses scp. # Make sure Ansible uses scp.
cat > ~vagrant/.ansible.cfg <<EOF cat > ~vagrant/.ansible.cfg <<EOF