openstack/kolla-ansible
Code Issues Proposed changes

Fix Magnum Kolla demo in contrib

Browse Source 
Magnum demo scripts doesn't work cause compose/openstack.env
doesn't exist anymore.
* NETWORK_MANAGER check has been removed
* script has been updated to use Openstack client instead of
deprecated clients (neutron-client, glance-client).
* Magnum client calls have been adapted too.
* some enhancements (logs, variable) have been performed too.

Change-Id: I294b1876c9c7090785c0ebdd09b43843f88fb00b
Closes-Bug: #1670618
This commit is contained in:
Bertrand Lallau 2017-03-07 10:37:11 +01:00
parent 2852af4376
commit 4286a50113
2 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
contrib/demos/magnum/start
View File

@ -1,40 +1,34 @@
#!/bin/bash #!/bin/bash
NETWORK_MANAGER=$(grep -sri NETWORK_MANAGER ../../compose/openstack.env | cut -f2 -d "=")
if [ "$NETWORK_MANAGER" != "neutron" ]; then
echo 'Magnum depends on the Neutron network manager to operate.'
echo 'Exiting because the network manager is' "$NETWORK_MANAGER".
exit 1
fi
echo Downloading glance image.
IMAGE_URL=https://fedorapeople.org/groups/magnum IMAGE_URL=https://fedorapeople.org/groups/magnum
IMAGE=fedora-21-atomic-3.qcow2 IMAGE_NAME=fedora-21-atomic-6
IMAGE=${IMAGE_NAME}.qcow2
if ! [ -f "$IMAGE" ]; then if ! [ -f "$IMAGE" ]; then
echo "Downloading ${IMAGE_NAME} image"
curl -L -o ./$IMAGE $IMAGE_URL/$IMAGE curl -L -o ./$IMAGE $IMAGE_URL/$IMAGE
fi fi
NIC_ID=$(neutron net-show public1 | awk '/ id /{print $4}') NIC_ID=$(openstack network show public1 | awk '/ id /{print $4}')
glance image-delete fedora-21-atomic-3 2> /dev/null openstack image delete ${IMAGE_NAME} 2> /dev/null
echo Loading fedora-atomic image into glance echo "Loading ${IMAGE_NAME} image into glance"
glance image-create --name fedora-21-atomic-3 --progress --is-public true --disk-format qcow2 --container-format bare --file ./$IMAGE openstack image create --public --disk-format qcow2 --container-format bare --file ./$IMAGE ${IMAGE_NAME}
GLANCE_IMAGE_ID=$(glance image-show fedora-21-atomic-3 | grep id | awk '{print $4}') GLANCE_IMAGE_ID=$(openstack image show ${IMAGE_NAME} | grep id | awk '{print $4}')
echo registering os-distro property with image echo "Registering os-distro property with image"
glance image-update $GLANCE_IMAGE_ID --property os_distro=fedora-atomic openstack image set $GLANCE_IMAGE_ID --property os_distro=fedora-atomic
echo Creating baymodel echo "Creating cluster-template"
magnum baymodel-create \ magnum cluster-template-create \
--name testbaymodel \ --name testclustertemplate \
--image-id $GLANCE_IMAGE_ID \ --image $GLANCE_IMAGE_ID \
--keypair-id mykey \ --keypair mykey \
--fixed-network 10.0.3.0/24 \ --fixed-network 10.0.3.0/24 \
--external-network-id $NIC_ID \ --external-network $NIC_ID \
--dns-nameserver 8.8.8.8 --flavor-id m1.small \ --tls-disabled \
--dns-nameserver 8.8.8.8 --flavor m1.small \
--docker-volume-size 5 --coe kubernetes --docker-volume-size 5 --coe kubernetes
echo Creating Bay echo "Creating cluster"
magnum bay-create --name testbay --baymodel testbaymodel --node-count 2 magnum cluster-create --name testcluster --cluster-template testclustertemplate --node-count 2

9
contrib/demos/magnum/stop
View File

@ -1,8 +1,9 @@
#!/bin/bash #!/bin/bash
magnum bay-delete testbay echo "Deleting cluster"
while magnum bay-list | grep -q testbay; do magnum cluster-delete testcluster
while magnum cluster-list | grep -q testcluster; do
sleep 1 sleep 1
done done
magnum baymodel-delete testbaymodel echo "Deleting cluster-template"
magnum cluster-template-delete testclustertemplate