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

[Corey Bryant]

[Liam Young (gnuoy)]

review: Approve

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2016-07-18 08:04:47 +0000
+++ charmhelpers/contrib/openstack/utils.py	2016-07-20 21:01:00 +0000
@@ -212,6 +212,7 @@
     'glance': 'git://github.com/openstack/glance',
     'horizon': 'git://github.com/openstack/horizon',
     'keystone': 'git://github.com/openstack/keystone',
+    'networking-hyperv': 'git://github.com/openstack/networking-hyperv',
     'neutron': 'git://github.com/openstack/neutron',
     'neutron-fwaas': 'git://github.com/openstack/neutron-fwaas',
     'neutron-lbaas': 'git://github.com/openstack/neutron-lbaas',
@@ -761,6 +762,13 @@
             if service in ['neutron-api', 'neutron-gateway',
                            'neutron-openvswitch']:
                 core_project = 'neutron'
+                if service == 'neutron-api':
+                    repo = {
+                        'name': 'networking-hyperv',
+                        'repository': GIT_DEFAULT_REPOS['networking-hyperv'],
+                        'branch': branch,
+                    }
+                    repos.append(repo)
                 for project in ['neutron-fwaas', 'neutron-lbaas',
                                 'neutron-vpnaas', 'nova']:
                     repo = {