openstack
/
kolla-ansible
Code Issues Proposed changes

Updates Heat template Compose and Kolla Repositories 

Previously, compose was being pulled from sdake. Since pull 1011
for pid=host support was merged, we can now use the upstream repo.

Additionally, the heat template was using the Kolla ml-3 release.
Since ml3 was cut, trunk should be reverted to using Kolla trunk.

Change-Id: I44ad01ee9fde914c87d981c05b825fa549420f8c
This commit is contained in:
Daneyon Hansen 2015-04-09 18:20:28 +00:00
parent 82578471ae
commit db860f148e
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devenv/kollanode.yaml
View File

@ -168,20 +168,14 @@ resources:
./docker -d &
# Install Compose with pid=host support
# TODO: Use pkg when github.com/docker/compose/pull/1011 is merged
cd /root
git clone http://github.com/sdake/fig
cd fig
git clone http://github.com/docker/compose.git
cd compose
pip install -e .
pip install -U docker-py
pip install -e .
pip install six==1.7.3
# Pull the Kolla repo
cd /root
curl -L -O https://github.com/stackforge/kolla/archive/version-m3.tar.gz
tar -xvf version-m3.tar.gz
mv kolla-version-m3 kolla
git clone https://github.com/stackforge/kolla.git
# Add vxlan kernel module for Neutron
modprobe vxlan