openstack/kolla-ansible
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2015-09-02 15:10:33 +00:00 committed by Gerrit Code Review
commit c1fb5930c1
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