openstack/kolla-ansible
Code Issues Proposed changes

Merge "Updates Heat template to Support Magnum"

Browse Source
This commit is contained in:
Jenkins 2015-06-18 21:54:29 +00:00 committed by Gerrit Code Review
commit 7e7ce4492b
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devenv/kollanode.yaml
View File

@ -159,7 +159,7 @@ resources:
chkconfig network on chkconfig network on
# Install base packages # Install base packages
yum -y install wget ntp git tcpdump python-pip yum -y install wget ntp git tcpdump python-pip python-devel
# Install Docker from binaries # Install Docker from binaries
curl -L https://master.dockerproject.com/linux/amd64/docker-1.7.0-dev -o /usr/local/sbin/docker curl -L https://master.dockerproject.com/linux/amd64/docker-1.7.0-dev -o /usr/local/sbin/docker
@ -195,6 +195,15 @@ resources:
service firewalld stop service firewalld stop
chkconfig firewalld off chkconfig firewalld off
# Install Magnum Client
git clone http://github.com/openstack/python-magnumclient
cd python-magnumclient
sudo pip install -e .
# Install Magnum Client Deps
# TODO remove when fixed: https://bugs.launchpad.net/python-magnumclient/+bug/1456360
sudo pip install oslo.serialization
# Send the CFN signal # Send the CFN signal
cfn-signal -e0 --data 'OK' -r 'Setup complete' '$WAIT_HANDLE' cfn-signal -e0 --data 'OK' -r 'Setup complete' '$WAIT_HANDLE'
params: params: