Merge lp:~corey.bryant/charm-helpers/fixup-git-default-repos into lp:charm-helpers

[Corey Bryant]

This fixes up git_default_repos() to use git project names instead of service names when indexing GIT_DEFAULT_REPOS.

[lp:~corey.bryant/charm-helpers/fixup-git-default-repos]

589. By Stuart Bishop on 2016-06-17

[freyes, r=stub] Mock contrib.network.ufw.modprobe in tests as required

590. By James Page on 2016-06-23

Updates for DNS-HA support in non-api OpenStack charms.

591. By James Page on 2016-06-23

Rebase

592. By Liam Young on 2016-06-23

[gnuoy, r=james-page] Decode result of check_output in network_get_primary_address

Under python3.5 check_output returns bytes which need decoding. This change
adds the decode to network_get_primary_address and brings it in line with other
core hookenv functions.

593. By James Page on 2016-06-23

Fixes for deploy from source for openstack

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2016-06-14 10:52:12 +0000
+++ charmhelpers/contrib/openstack/utils.py	2016-06-16 14:23:24 +0000
@@ -725,14 +725,15 @@
 requirements_dir = None
 
 
-def git_default_repos(projects):
+def git_default_repos(projects_yaml):
     """
     Returns default repos if a default openstack-origin-git value is specified.
     """
     service = service_name()
+    core_project = service
 
     for default, branch in GIT_DEFAULT_BRANCHES.iteritems():
-        if projects == default:
+        if projects_yaml == default:
 
             # add the requirements repo first
             repo = {
@@ -742,34 +743,41 @@
             }
             repos = [repo]
 
-            # neutron and nova charms require some additional repos
-            if service == 'neutron':
-                for svc in ['neutron-fwaas', 'neutron-lbaas', 'neutron-vpnaas']:
+            # neutron-* and nova-* charms require some additional repos
+            if service in ['neutron-api', 'neutron-gateway',
+                           'neutron-openvswitch']:
+                core_project = 'neutron'
+                for project in ['neutron-fwaas', 'neutron-lbaas',
+                                'neutron-vpnaas']:
                     repo = {
-                        'name': svc,
-                        'repository': GIT_DEFAULT_REPOS[svc],
+                        'name': project,
+                        'repository': GIT_DEFAULT_REPOS[project],
                         'branch': branch,
                     }
                     repos.append(repo)
-            elif service == 'nova':
+
+            elif service in ['nova-cloud-controller', 'nova-compute']:
+                core_project = 'nova'
                 repo = {
                     'name': 'neutron',
                     'repository': GIT_DEFAULT_REPOS['neutron'],
                     'branch': branch,
                 }
                 repos.append(repo)
+            elif service == 'openstack-dashboard':
+                core_project = 'horizon'
 
-            # finally add the current service's repo
+            # finally add the current service's core project repo
             repo = {
-                'name': service,
-                'repository': GIT_DEFAULT_REPOS[service],
+                'name': core_project,
+                'repository': GIT_DEFAULT_REPOS[core_project],
                 'branch': branch,
             }
             repos.append(repo)
 
             return yaml.dump(dict(repositories=repos))
 
-    return projects
+    return projects_yaml
 
 
 def _git_yaml_load(projects_yaml):