openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix Heat Kolla demo in contrib"

Browse Source
This commit is contained in:
Jenkins 2017-05-03 13:29:55 +00:00 committed by Gerrit Code Review
commit 14fa5583d9
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
contrib/demos/heat/launch
View File

@ -1,11 +1,18 @@
#!/bin/bash
VM_COUNT=3 VM_COUNT=3
IMAGE_FLAVOR=m1.small IMAGE_FLAVOR=m1.small
PUBLIC_NET_ID=$(neutron net-list | grep public | awk '{print $2}') PUBLIC_NET_ID=$(openstack network show public1 | awk '/ id /{print $4}')
DEMO_NET_ID=$(neutron net-list | grep demo | awk '{print $2}') DEMO_NET_ID=$(openstack network show demo-net | awk '/ id /{print $4}')
DEMO_SUBNET_ID=$(neutron net-list | grep demo | awk '{print $6}') DEMO_SUBNET_ID=$(openstack subnet show demo-subnet | awk '/ id /{print $4}')
echo Public net id is $PUBLIC_NET_ID echo "Public net id is $PUBLIC_NET_ID"
echo Demo net id is $DEMO_NET_ID echo "Demo net id is $DEMO_NET_ID"
echo Demo subnet id is $DEMO_SUBNET_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