Merge lp:~corey.bryant/charm-helpers/networking-hyperv into lp:charm-helpers

Proposed by Corey Bryant
Status: Merged
Merged at revision: 614
Proposed branch: lp:~corey.bryant/charm-helpers/networking-hyperv
Merge into: lp:charm-helpers
Diff against target: 25 lines (+8/-0)
1 file modified
charmhelpers/contrib/openstack/utils.py (+8/-0)
To merge this branch: bzr merge lp:~corey.bryant/charm-helpers/networking-hyperv
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+300663@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Liam Young (gnuoy) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/utils.py'
2--- charmhelpers/contrib/openstack/utils.py 2016-07-18 08:04:47 +0000
3+++ charmhelpers/contrib/openstack/utils.py 2016-07-20 21:01:00 +0000
4@@ -212,6 +212,7 @@
5 'glance': 'git://github.com/openstack/glance',
6 'horizon': 'git://github.com/openstack/horizon',
7 'keystone': 'git://github.com/openstack/keystone',
8+ 'networking-hyperv': 'git://github.com/openstack/networking-hyperv',
9 'neutron': 'git://github.com/openstack/neutron',
10 'neutron-fwaas': 'git://github.com/openstack/neutron-fwaas',
11 'neutron-lbaas': 'git://github.com/openstack/neutron-lbaas',
12@@ -761,6 +762,13 @@
13 if service in ['neutron-api', 'neutron-gateway',
14 'neutron-openvswitch']:
15 core_project = 'neutron'
16+ if service == 'neutron-api':
17+ repo = {
18+ 'name': 'networking-hyperv',
19+ 'repository': GIT_DEFAULT_REPOS['networking-hyperv'],
20+ 'branch': branch,
21+ }
22+ repos.append(repo)
23 for project in ['neutron-fwaas', 'neutron-lbaas',
24 'neutron-vpnaas', 'nova']:
25 repo = {

Subscribers

People subscribed via source and target branches