Merge lp:~thomnico/sademos/juju-on-openstack-resumed into lp:sademos/16.04

[Nicolas Thomas]

[mahmoh (mahmoh)]

Noticed one thing on a quick overview:

openstack/01-deploy.sh:

+juju set-model-config cloudimg-base-url=http://172.27.60.1/mirrors/cloud-images.ubuntu.com/query
31

^static IP, I'm guessing you have OB60?

Note: for grabbing the cloud images from /srv/, definitely the way to go but would be nice to have a checksum check to ensure they were all downloaded properly the first time although testing one's setup would reveal this problem also.

[Nicolas Thomas (thomnico)]

Good catch,

It is a remains of the offline work that I plan to provide separately
to avoid a huge review.

Will remove from now

On Fri, Jun 17, 2016 at 3:15 PM, M.Morana <email address hidden> wrote:
> Noticed one thing on a quick overview:
>
> openstack/01-deploy.sh:
>
> +juju set-model-config cloudimg-base-url=http://172.27.60.1/mirrors/cloud-images.ubuntu.com/query
> 31
>
> ^static IP, I'm guessing you have OB60?
>
> Note: for grabbing the cloud images from /srv/, definitely the way to go but would be nice to have a checksum check to ensure they were all downloaded properly the first time although testing one's setup would reveal this problem also.
> --
> https://code.launchpad.net/~thomnico/sademos/juju-on-openstack-resumed/+merge/297745
> You are the owner of lp:~thomnico/sademos/juju-on-openstack-resumed.

--
Best Regards,
       Nicolas Thomas
http://insights.ubuntu.com/?p=889
EMEA Solution Architect Canonical
GPG FPR: D592 4185 F099 9031 6590 6292 492F C740 F03A 7EB9

[lp:~thomnico/sademos/juju-on-openstack-resumed]

95. By Nicolas Thomas on 2016-06-17

Remove the off-line related part.
clean up the code

modified:
  openstack/01-deploy.sh

96. By Nicolas Thomas on 2016-06-17

Add Xenial to the mix ..

modified:
  openstack/get-cloud-images

[Scott Croft (secroft)]

Also, with juju 2.0, it's add-model now
On Jun 17, 2016 08:30, "Nicolas Thomas" <email address hidden>
wrote:

> Good catch,
>
> It is a remains of the offline work that I plan to provide separately
> to avoid a huge review.
>
> Will remove from now
>
> On Fri, Jun 17, 2016 at 3:15 PM, M.Morana <email address hidden> wrote:
> > Noticed one thing on a quick overview:
> >
> > openstack/01-deploy.sh:
> >
> > +juju set-model-config cloudimg-base-url=
> http://172.27.60.1/mirrors/cloud-images.ubuntu.com/query
> > 31
> >
> > ^static IP, I'm guessing you have OB60?
> >
> > Note: for grabbing the cloud images from /srv/, definitely the way to go
> but would be nice to have a checksum check to ensure they were all
> downloaded properly the first time although testing one's setup would
> reveal this problem also.
> > --
> >
> https://code.launchpad.net/~thomnico/sademos/juju-on-openstack-resumed/+merge/297745
> > You are the owner of lp:~thomnico/sademos/juju-on-openstack-resumed.
>
>
>
> --
> Best Regards,
> Nicolas Thomas
> http://insights.ubuntu.com/?p=889
> EMEA Solution Architect Canonical
> GPG FPR: D592 4185 F099 9031 6590 6292 492F C740 F03A 7EB9
>
>
> https://code.launchpad.net/~thomnico/sademos/juju-on-openstack-resumed/+merge/297745
> Your team CPE SA is requested to review the proposed merge of
> lp:~thomnico/sademos/juju-on-openstack-resumed into lp:sademos/16.04.
>

[lp:~thomnico/sademos/juju-on-openstack-resumed]

97. By Nicolas Thomas on 2016-06-17

fix create to add model

[Nicolas Thomas (thomnico)]

Fixed

Lost in translating to a limited scope ...

On Fri, Jun 17, 2016 at 3:48 PM, Scott Croft <email address hidden> wrote:
> Also, with juju 2.0, it's add-model now
> On Jun 17, 2016 08:30, "Nicolas Thomas" <email address hidden>
> wrote:
>
>> Good catch,
>>
>> It is a remains of the offline work that I plan to provide separately
>> to avoid a huge review.
>>
>> Will remove from now
>>
>> On Fri, Jun 17, 2016 at 3:15 PM, M.Morana <email address hidden> wrote:
>> > Noticed one thing on a quick overview:
>> >
>> > openstack/01-deploy.sh:
>> >
>> > +juju set-model-config cloudimg-base-url=
>> http://172.27.60.1/mirrors/cloud-images.ubuntu.com/query
>> > 31
>> >
>> > ^static IP, I'm guessing you have OB60?
>> >
>> > Note: for grabbing the cloud images from /srv/, definitely the way to go
>> but would be nice to have a checksum check to ensure they were all
>> downloaded properly the first time although testing one's setup would
>> reveal this problem also.
>> > --
>> >
>> https://code.launchpad.net/~thomnico/sademos/juju-on-openstack-resumed/+merge/297745
>> > You are the owner of lp:~thomnico/sademos/juju-on-openstack-resumed.
>>
>>
>>
>> --
>> Best Regards,
>> Nicolas Thomas
>> http://insights.ubuntu.com/?p=889
>> EMEA Solution Architect Canonical
>> GPG FPR: D592 4185 F099 9031 6590 6292 492F C740 F03A 7EB9
>>
>>
>> https://code.launchpad.net/~thomnico/sademos/juju-on-openstack-resumed/+merge/297745
>> Your team CPE SA is requested to review the proposed merge of
>> lp:~thomnico/sademos/juju-on-openstack-resumed into lp:sademos/16.04.
>>
>
> --
> https://code.launchpad.net/~thomnico/sademos/juju-on-openstack-resumed/+merge/297745
> You are the owner of lp:~thomnico/sademos/juju-on-openstack-resumed.

--
Best Regards,
       Nicolas Thomas
http://insights.ubuntu.com/?p=889
EMEA Solution Architect Canonical
GPG FPR: D592 4185 F099 9031 6590 6292 492F C740 F03A 7EB9

Unmerged revisions

97. By Nicolas Thomas on 2016-06-17

fix create to add model

96. By Nicolas Thomas on 2016-06-17

Add Xenial to the mix ..

modified:
  openstack/get-cloud-images

95. By Nicolas Thomas on 2016-06-17

Remove the off-line related part.
clean up the code

modified:
  openstack/01-deploy.sh

94. By Nicolas Thomas on 2016-06-17

Rework the configure openstack to collect info from juju (no more passwd issues)
Set to use 172.72.(obnum+1) (need the range to be free TBC).
If setting VIP or os-public use it for nova (usefull for 2 network scenario).
Update Windows..

Rename to configure-juju-on-opnestack as it has nothing OB specific .. YES !!
Move to use swift for metadata and generate metadata for images created (juju doc is misleading).

renamed:
  openstack/orange-box-launch-openstack-juju => openstack/configure-juju-on-openstack
modified:
  00-bootstrap.sh
  openstack/01-deploy.sh
  openstack/orange-box-configure-openstack
  openstack/configure-juju-on-openstack

=== modified file '00-bootstrap.sh'
--- 00-bootstrap.sh	2016-04-21 20:21:52 +0000
+++ 00-bootstrap.sh	2016-06-17 14:41:49 +0000
@@ -11,7 +11,7 @@
 
 obnum=`hostname | cut -c 10- -`
 
-time juju bootstrap --to node00vm0ob${obnum}.maas --show-log --upload-tools maas-controller maas/172.27.${obnum}.1
+time juju bootstrap --to node00vm0ob${obnum}.maas --show-log maas-controller maas/172.27.${obnum}.1
 time juju switch admin
 
 URL=`juju gui --no-browser`

=== modified file 'openstack/01-deploy.sh'
--- openstack/01-deploy.sh	2016-04-21 19:55:54 +0000
+++ openstack/01-deploy.sh	2016-06-17 14:41:49 +0000
@@ -4,14 +4,10 @@
 
 model=`juju list-models |awk '{print $1}'|grep openstack`
 
-if [ ${model} = "openstack" ]; then
-     juju switch openstack
-     juju deploy openstack-liberty.yaml
-else
-     juju create-model openstack
-     juju switch openstack
-     juju deploy openstack-liberty.yaml
-fi
+[ "${model}" == "openstack" ] || juju add-model openstack
+juju switch openstack
+
+juju deploy openstack-liberty.yaml
 
 juju show-controllers --show-passwords|egrep "user|password"
 

=== renamed file 'openstack/orange-box-launch-openstack-juju' => 'openstack/configure-juju-on-openstack'
--- openstack/orange-box-launch-openstack-juju	2015-10-09 18:44:36 +0000
+++ openstack/configure-juju-on-openstack	2016-06-17 14:41:49 +0000
@@ -3,7 +3,7 @@
 #    orange-box-launch-openstack-juju
 #    Copyright (C) 2014 Canonical Ltd.
 #
-#    Authors: Darryl Weaver <[e-mail]>
+#    Authors: Nicolas Thomss  <[e-mail]>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -17,70 +17,123 @@
 #    You should have received a copy of the GNU General Public License
 
 set -ex
+## TODO use sudo apt-get install python-openstackclient    instead
+## examples:
+## openstack  ip floating list  --format=csv
+##  openstack  ip floating create  --format=shell ext_net
+## to avoid table parsing..
+## openstack server show -c status --format value my-instance-name
+
 
 echo "This command is run to launch the first instance on a new Orange box Openstack deployment"
 
 source ~/nova.rc
 
+
 #Create a floating IP for the instance
-FLOAT_IP="$(nova floating-ip-create | grep ext_net | awk '{ print $2}')"
-
+if ( nova list | grep jumpserver2 >/dev/null )
+then
+    FLOAT_IP="$(nova list | grep jumpserver2 | awk '{ print $13 }')"
+else
+    FLOAT_IP="$(nova floating-ip-create | grep ext_net |  awk 'BEGIN { FS = "|" } ; { print $2}'|tr -d '[[:space:]]')"
+fi
+    
 #Launch an instance
 NET_UUID="$(nova net-list | grep private | awk '{ print $2 }')"
-IMAGE_UUID="$(nova image-list | grep Trusty | awk '{ print $2 }')"
-nova boot --flavor 2 --key_name default --image $IMAGE_UUID --nic net-id=$NET_UUID --security_group default jumpserver
-sleep 40
-
+IMAGE_UUID="$(nova image-list | grep Xenial | awk '{ print $2 }')"
+nova list | grep jumpserver2 ||nova boot --flavor m1.small --key_name default --image $IMAGE_UUID --nic net-id=$NET_UUID --security_group default jumpserver2
+# checking jumpserver2 state until active ..
+INST_STATE=` nova show jumpserver2 | grep status | awk '{print $4}'`
+while [ $INST_STATE != "ACTIVE" ]; 
+do  
+    INST_STATE=` nova show jumpserver2 | grep status | awk '{print $4}'`
+    echo "Jumpserver2 instance state is: "$INST_STATE" waiting to be active"
+    sleep 1
+done
+sleep 6
 #Associate the floating IP with the new instance
-nova floating-ip-associate jumpserver $FLOAT_IP
+nova floating-ip-associate jumpserver2 $FLOAT_IP || true 
 sleep 10
+
+### make it more Readable
+export SSH="ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP"
+
+
+#Add juju stable repo
+$SSH sudo add-apt-repository -y ppa:juju/stable
+
 #SSH into the instance and install Juju
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP sudo apt-get -y install juju-core juju-quickstart juju-deployer
-
-#Set up the Juju default environment
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP juju init
+$SSH sudo apt-get -y update
+
+$SSH sudo apt-get -y install juju python-novaclient python-swiftclient
+
 
 #copy over SSH keys
-scp -o StrictHostKeyChecking=no ~/.ssh/id_rsa* ubuntu@$FLOAT_IP:
-
-#Output a juju env file that works on this cloud
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "echo 'default: openstack
-environments:
-    openstack:
-        type: openstack
-        use-floating-ip: true
-        network: private
-        auth-url: $OS_AUTH_URL
-        tenant-name: $OS_TENANT_NAME
-        region: $OS_REGION_NAME
-        auth-mode: userpass
-        username: $OS_USERNAME
-        password: $OS_PASSWORD
-        admin-secret: $OS_PASSWORD
-        default-series: trusty
-        http-proxy: http://10.14.4.1:8000
-        https-proxy: http://10.14.4.1:8000
-        ftp-proxy: http://10.14.4.1:8000
-        no-proxy: localhost,10.14.4.1
-        apt-http-proxy: http://10.14.4.1:8000
-        apt-https-proxy: http://10.14.4.1:8000
-        apt-ftp-proxy: http://10.14.4.1:8000
-' > ~/.juju/environments.yaml"
-
+scp -o StrictHostKeyChecking=no ~/.ssh/id_rsa* ubuntu@$FLOAT_IP:~/.ssh/
+
+
+#Output a juju cloud file that works on this cloud
+$SSH \
+"echo 'clouds:
+    openstack:
+      type: openstack
+      auth-types: [access-key, userpass]
+      regions:
+        $OS_REGION_NAME:
+          endpoint: $OS_AUTH_URL
+' > os-cloud.yaml"
+$SSH juju add-cloud openstack os-cloud.yaml
+
+#Output a juju cred file that works on this cloud
+$SSH \
+"echo 'credentials:
+  openstack:
+    openstack:
+      auth-type: userpass
+      password: $OS_PASSWORD
+      tenant-name: $OS_TENANT_NAME
+      username: $OS_USERNAME
+' > os-creds.yaml"
+
+$SSH "juju add-credential openstack -f os-creds.yaml"
+
+## Creating images metadata
+$SSH mkdir -p ~/juju-meta
+for s in precise trusty xenial win2012r2
+do
 #Create juju metadata
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju-metadata generate-image -a amd64 -u $OS_AUTH_URL -i $IMAGE_UUID -r $OS_REGION_NAME -s trusty"
-
-IMAGE_UUID="$(nova image-list | grep Precise | awk '{ print $2 }')"
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju-metadata generate-image -a amd64 -u $OS_AUTH_URL -i $IMAGE_UUID -r $OS_REGION_NAME -s precise"
-
+    IMAGE_UUID="$(nova image-list | grep -i $s | awk '{ print $2 }')"
+    [ -n "$IMAGE_UUID" ] &&  $SSH "juju metadata generate-image -a amd64 -u $OS_AUTH_URL -i $IMAGE_UUID -r $OS_REGION_NAME -d juju-meta/ -s $s"
+done
+
+## Generate tools (needed if windows is in).
+$SSH "juju metadata generate-tools -d juju-meta/ "
+
+## upload images and tools streams to swift and make public
+$SSH "cd ~/juju-meta/ && swift --os-auth-url $OS_AUTH_URL --os-username $OS_USERNAME \
+ --os-password $OS_PASSWORD --os-tenant-name $OS_TENANT_NAME \
+upload juju-meta images"
+$SSH "cd ~/juju-meta/ && swift --os-auth-url $OS_AUTH_URL --os-username $OS_USERNAME \
+ --os-password $OS_PASSWORD --os-tenant-name $OS_TENANT_NAME \
+upload juju-meta tools"
+
+$SSH swift --os-auth-url $OS_AUTH_URL --os-username $OS_USERNAME  --os-password $OS_PASSWORD \
+ --os-tenant-name $OS_TENANT_NAME  post -r '.r:*' juju-meta
+
+## collect the URL for getting the images 
+$($SSH swift --os-auth-url $OS_AUTH_URL --os-username $OS_USERNAME  --os-password $OS_PASSWORD \
+ --os-tenant-name $OS_TENANT_NAME auth)
+
+###
+###juju bootstrap openstack openstack --config image-metadata-url=http://192.168.16.5/juju/images/ --config network=private --upload-tools --debug -v
+###
+
+my_ip=`ip route | grep src| grep -v virb|grep -v lxcb| head -1| cut -d " " -f 12 `
 #Bootstrap Juju
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju bootstrap --metadata-source=/home/ubuntu --upload-tools=true --series=precise,trusty"
-
-#Deploy juju-gui
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "juju deploy --to 0 juju-gui && juju expose juju-gui"
-
-#Install the Orange-box-examples package
-ssh -o StrictHostKeyChecking=no ubuntu@$FLOAT_IP "sudo apt-add-repository ppa:orange-box-examples/ppa && sudo apt-get update && sudo apt-get install -y orange-box-examples"
+##$SSH "juju bootstrap openstack openstack --metadata-source=/var/www/html/juju-meta/ --upload-tools"
+$SSH "juju bootstrap openstack openstack --config image-metadata-url=$OS_STORAGE_URL/juju-meta/images/ --config tools-metadata-url=$OS_STORAGE_URL/juju-meta/tools/ --config network=private"
+
+
 
 ## useless if juju floating ip option on.
 #########################################
@@ -93,7 +146,9 @@
 echo "Now connect to the Juju-GUI at: http://$FLOAT_IP2/ to continue deployments on Openstack."
 echo "Pass: $OS_PASSWORD"
 
-echo "OR Log in to openstack Jumpserver to deploy from command line"
+echo "OR Log in to openstack Jumpserver2 to deploy from command line"
 echo "ssh ubuntu@$FLOAT_IP"
+echo " You must set the following if creating a new model:"
+echo " juju set-model-config image-metadata-url=$OS_STORAGE_URL/juju-meta/images/ tools-metadata-url=$OS_STORAGE_URL/juju-meta/tools/ network=private"
 exit
 

=== modified file 'openstack/get-cloud-images'
--- openstack/get-cloud-images	2016-01-31 11:07:43 +0000
+++ openstack/get-cloud-images	2016-06-17 14:41:49 +0000
@@ -2,11 +2,12 @@
 
 
 
-folder=/srv/data
+folder=/srv/data/
 URLS="http://cloud-images.ubuntu.com/precise/current/precise-server-cloudimg-amd64-disk1.img \
 http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img \
-http://cloud-images.ubuntu.com/wily/current/wily-server-cloudimg-amd64-disk1.img \
+http://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img \
 http://mirror.catn.com/pub/catn/images/qcow2/centos6.4-x86_64-gold-master.img \
+http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2 \
 http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-disk.img "
 
 for URL in $URLS
@@ -16,9 +17,9 @@
 then
     echo "$FILENAME already downloaded." 
 else
-    wget -q -O  $folder/$FILENAME $URL
+    wget  -O  $folder/$FILENAME $URL
 fi
 done
 
 
-echo "To download Windows image get there : http://www.cloudbase.it/cloud-init-for-windows-instances/"
+echo "To download Windows image get there : https://cloudbase.it/windows-cloud-images/"

=== modified file 'openstack/orange-box-configure-openstack'
--- openstack/orange-box-configure-openstack	2015-10-09 18:44:36 +0000
+++ openstack/orange-box-configure-openstack	2016-06-17 14:41:49 +0000
@@ -3,7 +3,7 @@
 #    orange-box-configure-openstack
 #    Copyright (C) 2014 Canonical Ltd.
 #
-#    Authors: Darryl Weaver <[e-mail]>
+#    Authors: Nicolas Thomss  <[e-mail]>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -21,74 +21,155 @@
 
 echo "This command is run to configure an Orange-Box Openstack deployment"
 
-PKGS=" python-keystone python-neutronclient python-novaclient python-glanceclient"
-dpkg -l $PKGS > /dev/null || sudo apt-get install -y $PKGS
-
-NEUTRON_EXT_NET_GW="10.14.4.1"
-NEUTRON_EXT_NET_CIDR="10.14.0.0/16"
-NEUTRON_EXT_NET_NAME="ext_net"
-NEUTRON_DNS="10.14.4.1"
-NEUTRON_FLOAT_RANGE_START="10.14.200.1"
-NEUTRON_FLOAT_RANGE_END="10.14.249.254"
-
-NEUTRON_FIXED_NET_CIDR="192.168.14.0/24"
-NEUTRON_FIXED_NET_NAME="admin_net"
-
-keystone=$(juju status keystone | grep public-address | head -1 | awk '{print $2}')
+## This is the only OB specific section:
+obnum=$(hostname | cut -c 10- -)
+external_net=$((obnum+1))
+
+NEUTRON_EXT_NET_GW="172.27.${external_net}.254"
+NEUTRON_EXT_NET_CIDR="172.27.${external_net}.0/23"
+
+NEUTRON_EXT_NET_NAME="ext_net" # Unused
+NEUTRON_DNS="172.27.$((obnum)).1"
+NEUTRON_FLOAT_RANGE_START="172.27.${external_net}.151"
+NEUTRON_FLOAT_RANGE_END="172.27.${external_net}.252"
+
+NEUTRON_FIXED_NET_CIDR="192.168.16.0/22"
+#NEUTRON_FIXED_NET_NAME="admin_net" # Unused
+
+#Check if VIP is set on keystone
+keystone_VIP=`juju get-config keystone| python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"settings\"][\"vip\"][\"value\"]"||true`
+
+if [ -n "$keystone_VIP" ]
+then
+    keystone=$keystone_VIP
+else
+    #if os-public-hostname is set and not VIP assume we need to use those at OpenStack endpoints.
+    keystone_PUBENDPOINT=`juju get-config keystone| python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"settings\"][\"os-public-hostname\"][\"value\"]"||true`
+    if [ -n "$keystone_PUBENDPOINT" ]
+    then
+	## will need to add the PUBENPOINT to the different services interfaces to enable access on ob-num+2 network.
+	## Assume a fresh install where the unit ID is 0 keystone/0 for example (TO BE FIXED)
+	unset DEVICE
+	for service in keystone cinder glance neutron-api nova-cloud-controller ceph-radosgw
+	do
+	    DEVICE=`juju ssh ${service}/0 "ip route" | grep 172.27.$((obnum+2)). |head -1 | awk '{ print $3}'`
+	    # assuming the os-public-name are IPs not names will fail if not set
+	    OSPUBLICIP=`juju get-config  ${service}| python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"settings\"][\"os-public-hostname\"][\"value\"]"||true`
+	    [ -n "$OSPUBLICIP" ] &&  juju ssh ${service}/0 "sudo ifconfig $DEVICE:1 $OSPUBLICIP"
+	done
+	keystone=$keystone_PUBENDPOINT
+    else
+	keystone=$(juju status keystone --format=yaml | grep public-address | head -1 | awk '{print $2}')
+    fi
+fi
+
 
 echo "export SERVICE_ENDPOINT=http://$keystone:35357/v2.0/
-export SERVICE_TOKEN=admin
+unset SERVICE_TOKEN
+unset SERVICE_ENDPOINT 
 export OS_AUTH_URL=http://$keystone:35357/v2.0/
-export OS_USERNAME=admin
-export OS_PASSWORD=admin
+export OS_USERNAME=$(juju get-config keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"settings\"][\"admin-user\"][\"value\"]")
+export OS_PASSWORD=$(juju get-config keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"settings\"][\"admin-password\"][\"value\"]")
 export OS_TENANT_NAME=admin
-export OS_REGION_NAME=RegionOne
+export OS_REGION_NAME=$(juju get-config keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"settings\"][\"region\"][\"value\"]")
 " > ~/nova.rc
 
-. ~/nova.rc
+source ~/nova.rc
 
 # Determine the tenant id for the configured tenant name.
 export TENANT_ID="$(keystone tenant-list | grep $OS_TENANT_NAME | awk '{ print $2 }')"
 
+if [ "$TENANT_ID" = "" ]; then
+	echo "Unable to find tenant ID, keystone auth problem"
+	exit
+fi
+
+echo "Configuring Openstack Neutron Networking"
+
 #create ext network with neutron for floating IPs
-EXTERNAL_NETWORK_ID=$(neutron net-create ext_net --tenant-id $TENANT_ID -- --router:external=True | grep " id" | awk '{print $4}')
-neutron subnet-create ext_net $NEUTRON_EXT_NET_CIDR --name ext_net_subnet --tenant-id $TENANT_ID \
+neutron net-show ext_net > /dev/null 2>&1 || neutron net-create ext_net --tenant-id $TENANT_ID -- --router:external=True
+EXTERNAL_NETWORK_ID=$(neutron net-show ext_net | grep " id" | awk '{print $4}')
+neutron subnet-show ext_net_subnet > /dev/null 2>&1 || neutron subnet-create ext_net $NEUTRON_EXT_NET_CIDR --name ext_net_subnet --tenant-id $TENANT_ID \
 --allocation-pool start=$NEUTRON_FLOAT_RANGE_START,end=$NEUTRON_FLOAT_RANGE_END \
 --gateway $NEUTRON_EXT_NET_GW --disable-dhcp --dns_nameservers $NEUTRON_DNS list=true
 
 #Create private network for neutron for tenant VMs
-neutron net-create private
-SUBNET_ID=$(neutron subnet-create private $NEUTRON_FIXED_NET_CIDR -- --name private_subnet --dns_nameservers list=true $NEUTRON_DNS | grep " id" | awk '{print $4}')
+neutron net-show private > /dev/null 2>&1 || neutron net-create private
+neutron subnet-show private_subnet > /dev/null 2>&1 || neutron subnet-create private $NEUTRON_FIXED_NET_CIDR -- --name private_subnet --dns_nameservers list=true $NEUTRON_DNS
+SUBNET_ID=$(neutron subnet-show private_subnet | grep " id" | awk '{print $4}')
 
 #Create router for external network and private network
-ROUTER_ID=$(neutron router-create --tenant-id $TENANT_ID provider-router | grep " id" | awk '{print $4}')
-neutron router-interface-add $ROUTER_ID $SUBNET_ID
+neutron router-show provider-router > /dev/null 2>&1 || neutron router-create --tenant-id $TENANT_ID provider-router
+ROUTER_ID=$(neutron router-show provider-router | grep " id" | awk '{print $4}')
+
+neutron router-gateway-clear provider-router || true
 neutron router-gateway-set $ROUTER_ID $EXTERNAL_NETWORK_ID
+## make it always ok to have it indempodent.
+neutron router-interface-add $ROUTER_ID $SUBNET_ID || true
+
+
+echo "Configuring security groups for access to ICMP, SSH and RDP by default"
 
 #Configure the default security group to allow ICMP and SSH
-nova  secgroup-add-rule default icmp -1 -1 0.0.0.0/0
-nova  secgroup-add-rule default tcp 22 22 0.0.0.0/0
+nova secgroup-list-rules default | grep icmp  > /dev/null 2>&1 || nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0 > /dev/null 2>&1
+nova secgroup-list-rules default | grep 22  > /dev/null 2>&1 || nova secgroup-add-rule default tcp 22 22 0.0.0.0/0 > /dev/null 2>&1
 #for rdp
-nova secgroup-add-rule default tcp 3389 3389 0.0.0.0/0
+nova secgroup-list-rules default | grep 3389  > /dev/null 2>&1 || nova secgroup-add-rule default tcp 3389 3389 0.0.0.0/0 > /dev/null 2>&1
+
+
+
+echo "Uploading default SSH key"
 
 #Upload a default SSH key
-nova  keypair-add --pub-key ~/.ssh/id_rsa.pub default
-
-#Remove the m1.tiny as it is too small for Ubuntu.
-nova flavor-delete m1.tiny
-nova flavor-delete m1.xlarge
+nova keypair-list | grep default  > /dev/null 2>&1 || nova  keypair-add --pub-key ~/.ssh/id_rsa.pub default > /dev/null 2>&1
+
+echo "Modifying the flavors to be better sized for the Orange Box"
+
+#Modify the flavours to fit better on the OB
+#nova flavor-create FLAVOR_NAME FLAVOR_ID RAM_IN_MB ROOT_DISK_IN_GB NUMBER_OF_VCPUS
+nova flavor-delete m1.tiny > /dev/null 2>&1
+nova flavor-delete m1.small > /dev/null 2>&1
+nova flavor-delete m1.medium > /dev/null 2>&1
+nova flavor-delete m1.large > /dev/null 2>&1
+nova flavor-delete m1.xlarge > /dev/null 2>&1
+nova flavor-create --is-public true m1.tiny auto 512 5 1 > /dev/null 2>&1
+nova flavor-create --is-public true m1.small auto 1024 10 1 > /dev/null 2>&1
+nova flavor-create --is-public true m1.medium auto 2048 10 2 > /dev/null 2>&1
+nova flavor-create --is-public true m1.large auto 3072 10 2 > /dev/null 2>&1
+## need extra for windows image (15g)
+nova flavor-create --is-public true m1.xlarge auto 8096 30 4  > /dev/null 2>&1
+
+echo "modifying default quotas for admin user"
 
 #Modify quotas for the tenant to allow large deployments
-nova quota-update --instances 100 $TENANT_ID
-nova quota-update --cores 200 $TENANT_ID
-nova quota-update --ram 204800 $TENANT_ID
-nova quota-update --security-groups 200 $TENANT_ID
+nova quota-update --instances 400 $TENANT_ID
+nova quota-update --cores 800 $TENANT_ID
+nova quota-update --ram 404800 $TENANT_ID
+nova quota-update --security-groups 4000 $TENANT_ID
+nova quota-update --floating_ips -1 $TENANT_ID
+nova quota-update --security-group-rules -1 $TENANT_ID
+
+### need to find how to change quota for the project not the tenant
+
+### modify default quota the same way..
+nova quota-class-update --instances 400 $TENANT_ID
+nova quota-class-update --cores 800 $TENANT_ID
+nova quota-class-update --ram 404800 $TENANT_ID
+nova quota-class-update --security-groups 4000 $TENANT_ID
+nova quota-class-update --floating_ips -1 $TENANT_ID
+nova quota-class-update --security-group-rules -1 $TENANT_ID
+
+echo "Uploading images to glance"
 
 #Upload images to glance
-glance add name="Precise x86_64" is_public=true container_format=ovf disk_format=qcow2 <  /srv/data/precise-server-cloudimg-amd64-disk1.img 
-glance add name="Trusty x86_64" is_public=true container_format=ovf disk_format=qcow2 <  /srv/data/trusty-server-cloudimg-amd64-disk1.img
-#glance add name="CentOS 6.4" is_public=true container_format=bare disk_format=qcow2 < /srv/data/centos6.4-x86_64-gold-master.img
-#glance add name="Cirros 0.3" is_public=true container_format=bare disk_format=qcow2 < /srv/data/cirros-0.3.2-x86_64-disk.img
-##glance add name="Windows Server 2012" is_public=true container_format=bare disk_format=qcow2 < /srv/data/windows_server_2012_r2_standard_eval_kvm_20140607.qcow2 &
+glance image-show "Precise x86_64" > /dev/null 2>&1 || glance image-create --name="Precise x86_64" --is-public=true --container-format=ovf --disk-format=qcow2 <  /srv/data/precise-server-cloudimg-amd64-disk1.img 
+glance image-show "Trusty x86_64" > /dev/null 2>&1 || glance image-create --name="Trusty x86_64" --is-public=true --container-format=ovf --disk-format=qcow2 <  /srv/data/trusty-server-cloudimg-amd64-disk1.img
+glance image-show "Xenial x86_64" > /dev/null 2>&1 || glance image-create --name="Xenial x86_64" --is-public=true --container-format=ovf --disk-format=qcow2 <  /srv/data/xenial-server-cloudimg-amd64-disk1.img
+
+glance image-show "CentOS 6.4" > /dev/null 2>&1 || glance image-create --name="CentOS 6.4" --is-public=true --container-format=bare --disk-format=qcow2 < /srv/data/centos6.4-x86_64-gold-master.img
+glance image-show "Cirros 0.3" > /dev/null 2>&1 || glance image-create --name="Cirros 0.3" --is-public=true --container-format=bare --disk-format=qcow2 < /srv/data/cirros-0.3.2-x86_64-disk.img
+## image name is used by script to generate metadata .. don't screw the series
+glance image-show "win2012r2" > /dev/null 2>&1 || gzip -cd /srv/data/windows_server_2012_r2_standard_eval_kvm_20151021.qcow2.gz |glance image-create --name="Windows Server 2012" --is-public=true --container-format=bare --disk-format=qcow2
+
 
 exit