Merge lp:~cjohnston/obsetup/kilo-neutron-g into lp:~secroft/obsetup/trunk

Proposed by Chris Johnston
Status: Needs review
Proposed branch: lp:~cjohnston/obsetup/kilo-neutron-g
Merge into: lp:~secroft/obsetup/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
demos/openstack/kilo/kilo.yaml (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/obsetup/kilo-neutron-g
Reviewer Review Type Date Requested Status
Scott Croft Pending
Review via email: mp+283675@code.launchpad.net

Commit message

Switch kilo to use neutron-gateway charm

To post a comment you must log in.
lp:~cjohnston/obsetup/kilo-neutron-g updated
54. By Chris Johnston

Switch kilo to use neutron-gateway charm

Unmerged revisions

54. By Chris Johnston

Switch kilo to use neutron-gateway charm

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'demos/openstack/kilo/kilo.yaml'
2--- demos/openstack/kilo/kilo.yaml 2015-10-09 18:44:36 +0000
3+++ demos/openstack/kilo/kilo.yaml 2016-01-22 18:20:15 +0000
4@@ -39,7 +39,7 @@
5 "gui-x": "776.1040649414062"
6 "gui-y": "-81.22811031341553"
7 "neutron-gateway":
8- branch: "lp:charms/trusty/quantum-gateway"
9+ branch: "lp:charms/trusty/neutron-gateway"
10 num_units: 1
11 constraints: tags=virtual
12 options:

Subscribers

People subscribed via source and target branches