diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-03 13:29:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-03 13:29:55 +0000 |
| commit | 14fa5583d99805dc5469a058d20a2aece07c0189 (patch) | |
| tree | 81f9fdae8c82a1297385d08c1149e8595ac23439 /contrib | |
| parent | 067fb6829f3a65a1d9a9ee219a812c99bbd3617d (diff) | |
| parent | 9d98f8050399577ab73881ec24f29306a8cd5620 (diff) | |
| download | kolla-ansible-14fa5583d99805dc5469a058d20a2aece07c0189.tar.gz kolla-ansible-14fa5583d99805dc5469a058d20a2aece07c0189.zip | |
Merge "Fix Heat Kolla demo in contrib"
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/demos/heat/launch | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/contrib/demos/heat/launch b/contrib/demos/heat/launch index 768b69eb0..9924f3fd9 100755 --- a/contrib/demos/heat/launch +++ b/contrib/demos/heat/launch @@ -1,11 +1,18 @@ +#!/bin/bash + VM_COUNT=3 IMAGE_FLAVOR=m1.small -PUBLIC_NET_ID=$(neutron net-list | grep public | awk '{print $2}') -DEMO_NET_ID=$(neutron net-list | grep demo | awk '{print $2}') -DEMO_SUBNET_ID=$(neutron net-list | grep demo | awk '{print $6}') +PUBLIC_NET_ID=$(openstack network show public1 | awk '/ id /{print $4}') +DEMO_NET_ID=$(openstack network show demo-net | awk '/ id /{print $4}') +DEMO_SUBNET_ID=$(openstack subnet show demo-subnet | awk '/ id /{print $4}') -echo Public net id is $PUBLIC_NET_ID -echo Demo net id is $DEMO_NET_ID -echo Demo subnet id is $DEMO_SUBNET_ID +echo "Public net id is $PUBLIC_NET_ID" +echo "Demo net id is $DEMO_NET_ID" +echo "Demo subnet id is $DEMO_SUBNET_ID" -heat stack-create steak --template-file steak-rg.yaml --parameters="vm_count=$VM_COUNT;image_flavor=$IMAGE_FLAVOR;public_net_id=$PUBLIC_NET_ID;demo_net_id=$DEMO_NET_ID;demo_subnet_id=$DEMO_SUBNET_ID" +openstack stack create --parameter vm_count=$VM_COUNT \ + --parameter image_flavor=$IMAGE_FLAVOR \ + --parameter public_net_id=$PUBLIC_NET_ID \ + --parameter demo_net_id=$DEMO_NET_ID \ + --parameter demo_subnet_id=$DEMO_SUBNET_ID \ + -t steak-rg.yaml steak |