Merge lp:~cpe-sa/sademos/16.04-nc-lxd-fix-20160506-1 into lp:sademos/16.04

[Michael Iatrou]

This is a superset of fixes for NC-LXD that have appeared during the preparation for ODS.

- Enables ZFS for NC-LXD
- Fixes LXD networking (the instances can now be accessed from the OB and have outbound connectivity)
- Cleanup of the OpenStack configuration script

Thanks to Massimo Morana for the initial patch set, Omar Lara for troubleshooting the LXD networking and Francisco Hernandez for sharing his OB for testing.

[Nicolas Thomas (thomnico)]

Big +1 for me .. worked without any tricks .. could deploy on it good job

[Scott Croft (secroft)]

review: Approve

Unmerged revisions

95. By Michael Iatrou on 2016-05-06

Fix NC-LXD demo

94. By Michael Iatrou on 2016-05-04

Fix OpenStack Liberty bundle (keystone)

=== modified file 'openstack/nclxd/configure-openstack'
--- openstack/nclxd/configure-openstack	2016-04-22 01:26:27 +0000
+++ openstack/nclxd/configure-openstack	2016-05-06 23:33:11 +0000
@@ -21,23 +21,22 @@
 
 echo "This command is run to configure an Orange-Box Openstack deployment"
 
-obnum=`hostname | cut -c 10- -`
-external_net=`expr ${obnum} + 1`
+obnum=$(hostname | cut -c 10- -)
+external_net=$((obnum+3))
 
-#QUANTUM_EXT_NET_GW="172.27.${external_net}.254"
-QUANTUM_EXT_NET_GW="172.27.${obnum}.1"
-QUANTUM_EXT_NET_CIDR="172.27.${obnum}.0/23"
-QUANTUM_EXT_NET_NAME="ext_net"
-QUANTUM_DNS="172.27.${obnum}.1"
+QUANTUM_EXT_NET_GW="172.27.${external_net}.254"
+#QUANTUM_EXT_NET_GW="172.27.${obnum}.1"
+QUANTUM_EXT_NET_CIDR="172.27.${external_net}.0/23"
+#QUANTUM_EXT_NET_NAME="ext_net" # Unused
+QUANTUM_DNS="172.27.$((obnum+2)).1"
 QUANTUM_FLOAT_RANGE_START="172.27.${external_net}.200"
 QUANTUM_FLOAT_RANGE_END="172.27.${external_net}.253"
 
 QUANTUM_FIXED_NET_CIDR="192.168.14.0/22"
-QUANTUM_FIXED_NET_NAME="admin_net"
+#QUANTUM_FIXED_NET_NAME="admin_net" # Unused
 
 #keystone=$(juju status keystone | grep public-address | head -1 | awk '{print $2}')
-keystone1=$(juju status keystone |grep Unit|awk '{print $6}')
-keystone=`echo $keystone1||tr '\n' ' '`
+keystone=$(juju status keystone | grep Unit | awk '{print $6}' | tr -d '\n')
 
 echo "export SERVICE_ENDPOINT=http://$keystone:35357/v2.0/
 export SERVICE_TOKEN=admin
@@ -51,7 +50,7 @@
 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 }')"
+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"
@@ -61,33 +60,33 @@
 echo "Configuring Openstack Neutron Networking"
 
 #create ext network with neutron for floating IPs
-neutron net-show ext_net > /dev/null 2>&1 || neutron net-create ext_net --tenant-id $TENANT_ID -- --router:external=True
+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 $QUANTUM_EXT_NET_CIDR --name ext_net_subnet --tenant-id $TENANT_ID \
---allocation-pool start=$QUANTUM_FLOAT_RANGE_START,end=$QUANTUM_FLOAT_RANGE_END \
---gateway $QUANTUM_EXT_NET_GW --disable-dhcp --dns_nameservers $QUANTUM_DNS list=true
+neutron subnet-show ext_net_subnet > /dev/null 2>&1 || neutron subnet-create ext_net "$QUANTUM_EXT_NET_CIDR" --name ext_net_subnet --tenant-id "$TENANT_ID" \
+--allocation-pool start="$QUANTUM_FLOAT_RANGE_START",end="$QUANTUM_FLOAT_RANGE_END" \
+--gateway "$QUANTUM_EXT_NET_GW" --disable-dhcp --dns_nameservers "$QUANTUM_DNS" list=true
 
 #Create private network for neutron for tenant VMs
 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 $QUANTUM_FIXED_NET_CIDR -- --name private_subnet --dns_nameservers list=true $QUANTUM_DNS
+neutron subnet-show private_subnet > /dev/null 2>&1 || neutron subnet-create private "$QUANTUM_FIXED_NET_CIDR" -- --name private_subnet --dns_nameservers list=true "$QUANTUM_DNS"
 SUBNET_ID=$(neutron subnet-show private_subnet | grep " id" | awk '{print $4}')
 
 #creating private network router
 
 
 #Create router for external network and private network
-neutron router-show cloud-router > /dev/null 2>&1 || neutron router-create --tenant-id $TENANT_ID cloud-router
+neutron router-show cloud-router > /dev/null 2>&1 || neutron router-create --tenant-id "$TENANT_ID" cloud-router
 ROUTER_ID=$(neutron router-show cloud-router | grep " id" | awk '{print $4}')
 
-PORT_ID=$(neutron port-list | grep $SUBNET_ID | awk '{print $2}')
+#PORT_ID=$(neutron port-list | grep "$SUBNET_ID" | awk '{print $2}') # Unused
 
 #if [ "$PORT_ID" != "" ]; then
 #	neutron router-interface-delete $ROUTER_ID port=$PORT_ID
 #fi
-neutron router-interface-add $ROUTER_ID $SUBNET_ID
+neutron router-interface-add "$ROUTER_ID" "$SUBNET_ID"
 
 neutron router-gateway-clear cloud-router
-neutron router-gateway-set $ROUTER_ID $EXTERNAL_NETWORK_ID
+neutron router-gateway-set "$ROUTER_ID" "$EXTERNAL_NETWORK_ID"
 
 echo "Configuring security groups for access to ICMP, SSH and RDP by default"
 
@@ -117,19 +116,19 @@
 nova flavor-create --is-public true m1.large auto 3072 10 2 > /dev/null 2>&1
 nova flavor-create --is-public true m1.xlarge auto 4096 10 2 > /dev/null 2>&1
 
-echo "modifying default quotas for admin user"
+echo "Modifying default quotas for admin user"
 
 #Modify quotas for the tenant to allow large deployments
-nova quota-update --instances -1 $TENANT_ID
-nova quota-update --cores -1 $TENANT_ID
-nova quota-update --ram -1 $TENANT_ID
-nova quota-update --security-groups -1 $TENANT_ID
-nova quota-update --fixed-ips -1 $TENANT_ID
-nova quota-update --security-group-rules -1 $TENANT_ID
-nova quota-update --security-groups -1 $TENANT_ID
-nova quota-update --floating-ips -1 $TENANT_ID
+nova quota-update --instances -1 "$TENANT_ID"
+nova quota-update --cores -1 "$TENANT_ID"
+nova quota-update --ram -1 "$TENANT_ID"
+nova quota-update --security-groups -1 "$TENANT_ID"
+nova quota-update --fixed-ips -1 "$TENANT_ID"
+nova quota-update --security-group-rules -1 "$TENANT_ID"
+nova quota-update --security-groups -1 "$TENANT_ID"
+nova quota-update --floating-ips -1 "$TENANT_ID"
 
-echo "Uploading images to glance"
+#echo "Uploading images to glance"
 
 #Upload images to glance
 #glance image-show "Precise x86_64" > /dev/null 2>&1 || glance add name="Precise x86_64" is_public=true container_format=ovf disk_format=qcow2 <  /srv/data/precise-server-cloudimg-amd64-disk1.img 
 
=== modified file 'openstack/nclxd/nclxd.yaml'
--- openstack/nclxd/nclxd.yaml	2016-04-22 00:18:27 +0000
+++ openstack/nclxd/nclxd.yaml	2016-05-06 23:33:11 +0000
@@ -13,9 +13,9 @@
     charm: "cs:xenial/lxd"
     series: xenial
     options: 
-      "block-device": /dev/sdb
+      "block-devices": /dev/sdb
       overwrite: true
-      "storage-type": lvm
+      "storage-type": zfs
     annotations: 
       "gui-x": "750"
       "gui-y": "250"
 
=== modified file 'openstack/openstack-liberty.yaml'
--- openstack/openstack-liberty.yaml	2016-04-08 18:03:47 +0000
+++ openstack/openstack-liberty.yaml	2016-05-06 23:33:11 +0000
@@ -159,7 +159,7 @@
     annotations:
       gui-x: '500'
       gui-y: '0'
-    charm: cs:trusty/keystone-33
+    charm: cs:trusty/keystone-254
     num_units: 1
     options:
       admin-password: openstack