OpenStack Charm Testing

Merge lp:~zulcss/openstack-charm-testing/zfs-default-lxd into lp:openstack-charm-testing

  1. zfs-default-lxd
  2. Merge into trunk
Proposed by Chuck Short
Status: Merged
Merged at revision: 213
Proposed branch: lp:~zulcss/openstack-charm-testing/zfs-default-lxd
Merge into: lp:openstack-charm-testing
Diff against target: 87 lines (+7/-7)
7 files modified
bundles/lxd/default.yaml (+1/-1)
bundles/lxd/next.yaml (+1/-1)
bundles/lxd/source/default.yaml (+1/-1)
bundles/lxd/source/next.yaml (+1/-1)
bundles/lxd/source/nova-liberty.yaml (+1/-1)
bundles/lxd/source/nova-master.yaml (+1/-1)
bundles/lxd/source/nova-mitaka.yaml (+1/-1)
To merge this branch: bzr merge lp:~zulcss/openstack-charm-testing/zfs-default-lxd
Reviewer Review Type Date Requested Status
Ryan Beisner Approve
Review via email: mp+296790@code.launchpad.net

Description of the change

Make zfs the default file system for lxd.

To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bundles/lxd/default.yaml'
2--- bundles/lxd/default.yaml 2016-04-22 13:26:46 +0000
3+++ bundles/lxd/default.yaml 2016-06-08 13:36:40 +0000
4@@ -88,7 +88,7 @@
5 options:
6 block-devices: /dev/vdb
7 ephemeral-unmount: /mnt
8- storage-type: lvm
9+ storage-type: zfs
10 overwrite: "true"
11 relations:
12 - [ keystone, mysql ]
13
14=== modified file 'bundles/lxd/next.yaml'
15--- bundles/lxd/next.yaml 2016-04-18 13:50:34 +0000
16+++ bundles/lxd/next.yaml 2016-06-08 13:36:40 +0000
17@@ -88,7 +88,7 @@
18 options:
19 block-devices: /dev/vdb
20 ephemeral-unmount: /mnt
21- storage-type: lvm
22+ storage-type: zfs
23 overwrite: "true"
24 relations:
25 - [ keystone, mysql ]
26
27=== modified file 'bundles/lxd/source/default.yaml'
28--- bundles/lxd/source/default.yaml 2016-04-21 10:49:44 +0000
29+++ bundles/lxd/source/default.yaml 2016-06-08 13:36:40 +0000
30@@ -88,7 +88,7 @@
31 options:
32 block-device: /dev/vdb
33 ephemeral-unmount: /mnt
34- storage-type: lvm
35+ storage-type: zfs
36 overwrite: "true"
37 relations:
38 - [ keystone, mysql ]
39
40=== modified file 'bundles/lxd/source/next.yaml'
41--- bundles/lxd/source/next.yaml 2016-04-18 13:50:34 +0000
42+++ bundles/lxd/source/next.yaml 2016-06-08 13:36:40 +0000
43@@ -88,7 +88,7 @@
44 options:
45 block-devices: /dev/vdb
46 ephemeral-unmount: /mnt
47- storage-type: lvm
48+ storage-type: zfs
49 overwrite: "true"
50 relations:
51 - [ keystone, mysql ]
52
53=== modified file 'bundles/lxd/source/nova-liberty.yaml'
54--- bundles/lxd/source/nova-liberty.yaml 2016-03-23 12:38:35 +0000
55+++ bundles/lxd/source/nova-liberty.yaml 2016-06-08 13:36:40 +0000
56@@ -11,6 +11,6 @@
57 - {name: nova,
58 repository: 'git://github.com/openstack/nova',
59 branch: stable/liberty}
60-directory: /mnt/openstack-git
61+directory: /home/ubuntu/openstack-git
62 http_proxy: http://squid.internal:3128
63 https_proxy: http://squid.internal:3128
64
65=== modified file 'bundles/lxd/source/nova-master.yaml'
66--- bundles/lxd/source/nova-master.yaml 2016-03-23 12:38:05 +0000
67+++ bundles/lxd/source/nova-master.yaml 2016-06-08 13:36:40 +0000
68@@ -11,6 +11,6 @@
69 - {name: nova,
70 repository: 'git://github.com/openstack/nova',
71 branch: master}
72-directory: /mnt/openstack-git
73+directory: /home/ubuntu/openstack-git
74 http_proxy: http://squid.internal:3128
75 https_proxy: http://squid.internal:3128
76
77=== modified file 'bundles/lxd/source/nova-mitaka.yaml'
78--- bundles/lxd/source/nova-mitaka.yaml 2016-04-11 15:16:02 +0000
79+++ bundles/lxd/source/nova-mitaka.yaml 2016-06-08 13:36:40 +0000
80@@ -11,6 +11,6 @@
81 - {name: nova,
82 repository: 'git://github.com/openstack/nova',
83 branch: stable/mitaka}
84-directory: /mnt/openstack-git
85+directory: /home/ubuntu/openstack-git
86 http_proxy: http://squid.internal:3128
87 https_proxy: http://squid.internal:3128

Subscribers

People subscribed via source and target branches

to status/vote changes: