Merge lp:~saviq/openstack-charm-testing/lxd-drop-prefixes into lp:~zulcss/openstack-charm-testing/lxd-refactor

Proposed by Michał Sawicz on 2015-07-28
Status: Needs review
Proposed branch: lp:~saviq/openstack-charm-testing/lxd-drop-prefixes
Merge into: lp:~zulcss/openstack-charm-testing/lxd-refactor
Diff against target: 18 lines (+4/-4)
1 file modified
bundles/lxd/source/lxd.yaml (+4/-4)
To merge this branch: bzr merge lp:~saviq/openstack-charm-testing/lxd-drop-prefixes
Reviewer Review Type Date Requested Status
Chuck Short 2015-07-28 Pending
Review via email: mp+266093@code.launchpad.net

Commit message

Drop redundant prefixes in lxd config

To post a comment you must log in.

Unmerged revisions

122. By Michał Sawicz on 2015-07-28

Drop redundant lxd config prefixes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bundles/lxd/source/lxd.yaml'
2--- bundles/lxd/source/lxd.yaml 2015-07-23 20:48:46 +0000
3+++ bundles/lxd/source/lxd.yaml 2015-07-28 13:18:16 +0000
4@@ -102,10 +102,10 @@
5 lxd:
6 branch: lp:~zulcss/+junk/lxd-container
7 options:
8- lxd-block-device: /mnt/disk.img|20G
9- lxd-origin: ppa:ubuntu-lxc/lxd-git-master
10- lxd-use-source: True
11- lxd-trust-password: blah
12+ block-device: /mnt/disk.img|20G
13+ origin: ppa:ubuntu-lxc/lxd-git-master
14+ use-source: True
15+ trust-password: blah
16 relations:
17 - [ keystone, mysql ]
18 - [ nova-cloud-controller, mysql ]

Subscribers

People subscribed via source and target branches

to all changes: