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
=== modified file 'bundles/lxd/default.yaml'
--- bundles/lxd/default.yaml 2016-04-22 13:26:46 +0000
+++ bundles/lxd/default.yaml 2016-06-08 13:36:40 +0000
@@ -88,7 +88,7 @@
88 options:88 options:
89 block-devices: /dev/vdb89 block-devices: /dev/vdb
90 ephemeral-unmount: /mnt90 ephemeral-unmount: /mnt
91 storage-type: lvm91 storage-type: zfs
92 overwrite: "true"92 overwrite: "true"
93 relations:93 relations:
94 - [ keystone, mysql ]94 - [ keystone, mysql ]
9595
=== modified file 'bundles/lxd/next.yaml'
--- bundles/lxd/next.yaml 2016-04-18 13:50:34 +0000
+++ bundles/lxd/next.yaml 2016-06-08 13:36:40 +0000
@@ -88,7 +88,7 @@
88 options:88 options:
89 block-devices: /dev/vdb89 block-devices: /dev/vdb
90 ephemeral-unmount: /mnt90 ephemeral-unmount: /mnt
91 storage-type: lvm91 storage-type: zfs
92 overwrite: "true"92 overwrite: "true"
93 relations:93 relations:
94 - [ keystone, mysql ]94 - [ keystone, mysql ]
9595
=== modified file 'bundles/lxd/source/default.yaml'
--- bundles/lxd/source/default.yaml 2016-04-21 10:49:44 +0000
+++ bundles/lxd/source/default.yaml 2016-06-08 13:36:40 +0000
@@ -88,7 +88,7 @@
88 options:88 options:
89 block-device: /dev/vdb89 block-device: /dev/vdb
90 ephemeral-unmount: /mnt90 ephemeral-unmount: /mnt
91 storage-type: lvm91 storage-type: zfs
92 overwrite: "true"92 overwrite: "true"
93 relations:93 relations:
94 - [ keystone, mysql ]94 - [ keystone, mysql ]
9595
=== modified file 'bundles/lxd/source/next.yaml'
--- bundles/lxd/source/next.yaml 2016-04-18 13:50:34 +0000
+++ bundles/lxd/source/next.yaml 2016-06-08 13:36:40 +0000
@@ -88,7 +88,7 @@
88 options:88 options:
89 block-devices: /dev/vdb89 block-devices: /dev/vdb
90 ephemeral-unmount: /mnt90 ephemeral-unmount: /mnt
91 storage-type: lvm91 storage-type: zfs
92 overwrite: "true"92 overwrite: "true"
93 relations:93 relations:
94 - [ keystone, mysql ]94 - [ keystone, mysql ]
9595
=== modified file 'bundles/lxd/source/nova-liberty.yaml'
--- bundles/lxd/source/nova-liberty.yaml 2016-03-23 12:38:35 +0000
+++ bundles/lxd/source/nova-liberty.yaml 2016-06-08 13:36:40 +0000
@@ -11,6 +11,6 @@
11 - {name: nova,11 - {name: nova,
12 repository: 'git://github.com/openstack/nova',12 repository: 'git://github.com/openstack/nova',
13 branch: stable/liberty}13 branch: stable/liberty}
14directory: /mnt/openstack-git14directory: /home/ubuntu/openstack-git
15http_proxy: http://squid.internal:312815http_proxy: http://squid.internal:3128
16https_proxy: http://squid.internal:312816https_proxy: http://squid.internal:3128
1717
=== modified file 'bundles/lxd/source/nova-master.yaml'
--- bundles/lxd/source/nova-master.yaml 2016-03-23 12:38:05 +0000
+++ bundles/lxd/source/nova-master.yaml 2016-06-08 13:36:40 +0000
@@ -11,6 +11,6 @@
11 - {name: nova,11 - {name: nova,
12 repository: 'git://github.com/openstack/nova',12 repository: 'git://github.com/openstack/nova',
13 branch: master}13 branch: master}
14directory: /mnt/openstack-git14directory: /home/ubuntu/openstack-git
15http_proxy: http://squid.internal:312815http_proxy: http://squid.internal:3128
16https_proxy: http://squid.internal:312816https_proxy: http://squid.internal:3128
1717
=== modified file 'bundles/lxd/source/nova-mitaka.yaml'
--- bundles/lxd/source/nova-mitaka.yaml 2016-04-11 15:16:02 +0000
+++ bundles/lxd/source/nova-mitaka.yaml 2016-06-08 13:36:40 +0000
@@ -11,6 +11,6 @@
11 - {name: nova,11 - {name: nova,
12 repository: 'git://github.com/openstack/nova',12 repository: 'git://github.com/openstack/nova',
13 branch: stable/mitaka}13 branch: stable/mitaka}
14directory: /mnt/openstack-git14directory: /home/ubuntu/openstack-git
15http_proxy: http://squid.internal:312815http_proxy: http://squid.internal:3128
16https_proxy: http://squid.internal:312816https_proxy: http://squid.internal:3128

Subscribers

People subscribed via source and target branches

to status/vote changes: