sademos

Merge lp:~cpe-sa/sademos/16.04-LXD-ZFS-Fixes into lp:sademos/16.04

  1. 16.04-LXD-ZFS-Fixes
  2. Merge into 16.04
Proposed by mahmoh
Status: Needs review
Proposed branch: lp:~cpe-sa/sademos/16.04-LXD-ZFS-Fixes
Merge into: lp:sademos/16.04
Diff against target: 24 lines (+3/-3)
1 file modified
openstack/nclxd/nclxd.yaml (+3/-3)
To merge this branch: bzr merge lp:~cpe-sa/sademos/16.04-LXD-ZFS-Fixes
Reviewer Review Type Date Requested Status
CPE SA Pending
Review via email: mp+292682@code.launchpad.net

Description of the change

These are the bundle changes required for NCLXD to work as of today, the rabbit charm will need to move back from -next, ideally test without -next and see if that works as I think it now should but only if time permits.

To post a comment you must log in.

Unmerged revisions

94. By mahmoh

NC-LXD fixes for ZFS support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openstack/nclxd/nclxd.yaml'
2--- openstack/nclxd/nclxd.yaml 2016-04-22 00:18:27 +0000
3+++ openstack/nclxd/nclxd.yaml 2016-04-22 20:04:23 +0000
4@@ -1,7 +1,7 @@
5 series: xenial
6 services:
7 "rabbitmq-server":
8- charm: "cs:~openstack-charmers/xenial/rabbitmq-server"
9+ charm: "cs:~openstack-charmers-next/xenial/rabbitmq-server"
10 series: xenial
11 num_units: 1
12 annotations:
13@@ -13,9 +13,9 @@
14 charm: "cs:xenial/lxd"
15 series: xenial
16 options:
17- "block-device": /dev/sdb
18+ "block-devices": /dev/sdb
19 overwrite: true
20- "storage-type": lvm
21+ "storage-type": zfs
22 annotations:
23 "gui-x": "750"
24 "gui-y": "250"

Subscribers

People subscribed via source and target branches

to all changes: