Merge lp:~zulcss/openstack-charm-testing/lxd-kvm-missing-option into lp:openstack-charm-testing

Proposed by Chuck Short
Status: Merged
Merged at revision: 195
Proposed branch: lp:~zulcss/openstack-charm-testing/lxd-kvm-missing-option
Merge into: lp:openstack-charm-testing
Diff against target: 23 lines (+2/-0)
2 files modified
bundles/lxd/source/default.yaml (+1/-0)
bundles/lxd/source/next.yaml (+1/-0)
To merge this branch: bzr merge lp:~zulcss/openstack-charm-testing/lxd-kvm-missing-option
Reviewer Review Type Date Requested Status
OpenStack Charm Testing Maintainers Pending
Review via email: mp+290997@code.launchpad.net

Description of the change

Re-add dropped option

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bundles/lxd/source/default.yaml'
--- bundles/lxd/source/default.yaml 2016-03-29 17:18:18 +0000
+++ bundles/lxd/source/default.yaml 2016-04-05 14:42:13 +0000
@@ -90,6 +90,7 @@
90 block-device: /dev/vdb90 block-device: /dev/vdb
91 ephemeral-unmount: /mnt91 ephemeral-unmount: /mnt
92 storage-type: lvm92 storage-type: lvm
93 overwrite: "true"
93 relations:94 relations:
94 - [ keystone, mysql ]95 - [ keystone, mysql ]
95 - [ nova-cloud-controller, mysql ]96 - [ nova-cloud-controller, mysql ]
9697
=== modified file 'bundles/lxd/source/next.yaml'
--- bundles/lxd/source/next.yaml 2016-03-29 15:44:36 +0000
+++ bundles/lxd/source/next.yaml 2016-04-05 14:42:13 +0000
@@ -90,6 +90,7 @@
90 block-device: /dev/vdb90 block-device: /dev/vdb
91 ephemeral-unmount: /mnt91 ephemeral-unmount: /mnt
92 storage-type: lvm92 storage-type: lvm
93 overwrite: "true"
93 relations:94 relations:
94 - [ keystone, mysql ]95 - [ keystone, mysql ]
95 - [ nova-cloud-controller, mysql ]96 - [ nova-cloud-controller, mysql ]

Subscribers

People subscribed via source and target branches

to status/vote changes: