OpenStack Charm Testing

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

  1. fix-lxd-profile
  2. Merge into trunk
Proposed by Chuck Short
Status: Merged
Merged at revision: 179
Proposed branch: lp:~zulcss/openstack-charm-testing/fix-lxd-profile
Merge into: lp:openstack-charm-testing
Diff against target: 38 lines (+5/-5)
2 files modified
profiles/lxd (+4/-4)
profiles/multihypervisor (+1/-1)
To merge this branch: bzr merge lp:~zulcss/openstack-charm-testing/fix-lxd-profile
Reviewer Review Type Date Requested Status
OpenStack Charm Testing Maintainers Pending
Review via email: mp+286560@code.launchpad.net

Description of the change

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

To post a comment you must log in.
lp:~zulcss/openstack-charm-testing/fix-lxd-profile updated
180. By Chuck Short

Update disk-format

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'profiles/lxd'
2--- profiles/lxd 2016-02-09 14:48:22 +0000
3+++ profiles/lxd 2016-02-18 20:29:52 +0000
4@@ -39,8 +39,8 @@
5 }
6
7 # Upload glance images to overcloud
8-glance --os-image-api-version 1 image-create --name="trusty-root.tar.xz" --is-public=true --progress \
9- --container-format=bare --disk-format=root-tar --property hypervisor_type=lxc \
10+glance --os-image-api-version 1 image-create --name="trusty-server" --is-public=true --progress \
11+ --container-format=bare --disk-format=raw --property hypervisor_type=lxc \
12 --property architecture=x86_64 < ~/images/trusty-server-cloudimg-amd64-root.tar.xz
13
14 # Create demo/testing users, tenants and flavor
15@@ -58,8 +58,8 @@
16 # Gather vars for tempest template
17 access=$(keystone --os-username demo --os-password pass --os-tenant-name demo ec2-credentials-create | grep access | awk '{ print $4 }')
18 secret=$(keystone ec2-credentials-get --access $access | grep secret | awk '{ print $4 }')
19-image_id=$(glance image-list | grep cirros | awk '{ print $2 }')
20-image_alt_id=$(glance image-list | grep precise | awk '{ print $2 }')
21+image_id=$(glance image-list | grep trusty-server | awk '{ print $2 }')
22+image_alt_id=$(glance image-list | grep trusty-server | awk '{ print $2 }')
23 ext_net=$(neutron net-list | grep ext_net | awk '{ print $2 }')
24 router=$(neutron router-list | grep provider-router | awk '{ print $2}')
25 keystone=$(juju-deployer -f keystone)
26
27=== modified file 'profiles/multihypervisor'
28--- profiles/multihypervisor 2016-02-09 14:48:22 +0000
29+++ profiles/multihypervisor 2016-02-18 20:29:52 +0000
30@@ -46,7 +46,7 @@
31 --container-format=bare --disk-format=qcow2 --property hypervisor_type=qemu \
32 --property architecture=x86_64 < ~/images/trusty-server-cloudimg-amd64-disk1.img
33 glance --os-image-api-version 1 image-create --name="trusty-root.tar.xz" --is-public=true --progress \
34- --container-format=bare --disk-format=root-tar --property hypervisor_type=lxc \
35+ --container-format=bare --disk-format=raw --property hypervisor_type=lxc \
36 --property architecture=x86_64 < ~/images/trusty-server-cloudimg-amd64-root.tar.xz
37
38 # Create demo/testing users, tenants and flavor

Subscribers

People subscribed via source and target branches

to status/vote changes: