diff options
| author | Daneyon Hansen <danehans@cisco.com> | 2015-04-09 18:20:28 +0000 |
|---|---|---|
| committer | Daneyon Hansen <danehans@cisco.com> | 2015-04-10 18:40:31 +0000 |
| commit | db860f148e251a5eb0a24538c90e3893fd46675d (patch) | |
| tree | d680a208897b6285d19a2096d5018a28ab6bcc2b | |
| parent | 82578471aee6f6da57a537176e7e39c4d4b2f819 (diff) | |
| download | kolla-db860f148e251a5eb0a24538c90e3893fd46675d.tar.gz kolla-db860f148e251a5eb0a24538c90e3893fd46675d.zip | |
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
| -rw-r--r-- | devenv/kollanode.yaml | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/devenv/kollanode.yaml b/devenv/kollanode.yaml index 259406f5c..808468d40 100644 --- a/devenv/kollanode.yaml +++ b/devenv/kollanode.yaml @@ -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 |