Merge lp:~zulcss/openstack-charm-testing/fix-lxd-profile into lp:openstack-charm-testing

[Chuck Short]

Fixes LXD profile, changes disk-format to raw and rename image name.

[lp:~zulcss/openstack-charm-testing/fix-lxd-profile]

180. By Chuck Short on 2016-02-18

Update disk-format

=== modified file 'profiles/lxd'
--- profiles/lxd	2016-02-09 14:48:22 +0000
+++ profiles/lxd	2016-02-18 20:29:52 +0000
@@ -39,8 +39,8 @@
 }
 
 # Upload glance images to overcloud
-glance --os-image-api-version 1 image-create --name="trusty-root.tar.xz" --is-public=true --progress \
-    --container-format=bare --disk-format=root-tar --property hypervisor_type=lxc \
+glance --os-image-api-version 1 image-create --name="trusty-server" --is-public=true --progress \
+    --container-format=bare --disk-format=raw --property hypervisor_type=lxc \
     --property architecture=x86_64 < ~/images/trusty-server-cloudimg-amd64-root.tar.xz
 
 # Create demo/testing users, tenants and flavor
@@ -58,8 +58,8 @@
 # Gather vars for tempest template
 access=$(keystone --os-username demo --os-password pass --os-tenant-name demo ec2-credentials-create | grep access | awk '{ print $4 }')
 secret=$(keystone ec2-credentials-get --access $access | grep secret | awk '{ print $4 }')
-image_id=$(glance image-list | grep cirros | awk '{ print $2 }')
-image_alt_id=$(glance image-list | grep precise | awk '{ print $2 }')
+image_id=$(glance image-list | grep trusty-server | awk '{ print $2 }')
+image_alt_id=$(glance image-list | grep trusty-server | awk '{ print $2 }')
 ext_net=$(neutron net-list | grep ext_net | awk '{ print $2 }')
 router=$(neutron router-list | grep provider-router | awk '{ print $2}')
 keystone=$(juju-deployer -f keystone)
 
=== modified file 'profiles/multihypervisor'
--- profiles/multihypervisor	2016-02-09 14:48:22 +0000
+++ profiles/multihypervisor	2016-02-18 20:29:52 +0000
@@ -46,7 +46,7 @@
     --container-format=bare --disk-format=qcow2 --property hypervisor_type=qemu \
     --property architecture=x86_64 < ~/images/trusty-server-cloudimg-amd64-disk1.img
 glance --os-image-api-version 1 image-create --name="trusty-root.tar.xz" --is-public=true --progress \
-    --container-format=bare --disk-format=root-tar --property hypervisor_type=lxc \
+    --container-format=bare --disk-format=raw --property hypervisor_type=lxc \
     --property architecture=x86_64 < ~/images/trusty-server-cloudimg-amd64-root.tar.xz
 
 # Create demo/testing users, tenants and flavor