Merge lp:~corey.bryant/charm-helpers/os-release-check-candidate into lp:charm-helpers

[Corey Bryant]

[lp:~corey.bryant/charm-helpers/os-release-check-candidate]

602. By Ryan Beisner on 2016-07-12

[chris.macnaughton, r=1chb1n] Add ceph-proxy to source charms for openstack amulet helper

603. By Corey Bryant on 2016-07-12

Add flag to disable upper constraints

By default, deploy from source now uses upper constraints to install
known good dependency versions. Upper contraints will always be used
when using openstack-origin-git default values. However when manually
specifying git repos to openstack-origin-git, users can now set
use_contraints to false, allowing various openstack dependency versions
to be tested.

604. By Corey Bryant on 2016-07-12

Drop kilo DFS default because upper constraints doesn't work in kilo for openstack-dashboard and glance.

605. By Corey Bryant on 2016-07-12

Determine openstack release based on openstack-origin-git

Prior to this change, when a charm specified openstack-origin-git
to deploy from source, it also required openstack-origin to be specified
to determine the openstack relase. This drops the need for specifying
openstack-origin.

[James Page (james-page)]

Two comments - I think yakkety/newton is mixed up a bit.

review: Needs Fixing

[lp:~corey.bryant/charm-helpers/os-release-check-candidate]

606. By Corey Bryant on 2016-07-13

Switch yakkety typo to newton

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2016-07-06 14:41:05 +0000
+++ charmhelpers/contrib/openstack/utils.py	2016-07-13 12:27:09 +0000
@@ -220,7 +220,6 @@
 }
 
 GIT_DEFAULT_BRANCHES = {
-    'kilo': 'stable/kilo',
     'liberty': 'stable/liberty',
     'mitaka': 'stable/mitaka',
     'master': 'master',
@@ -413,7 +412,8 @@
     global os_rel
     if os_rel:
         return os_rel
-    os_rel = (get_os_codename_package(package, fatal=False) or
+    os_rel = (git_os_codename_install_source(config('openstack-origin-git')) or
+              get_os_codename_package(package, fatal=False) or
               get_os_codename_install_source(config('openstack-origin')) or
               base)
     return os_rel
@@ -719,7 +719,24 @@
     return config('openstack-origin-git') is not None
 
 
-requirements_dir = None
+def git_os_codename_install_source(projects_yaml):
+    """
+    Returns OpenStack codename of release being installed from source.
+    """
+    if git_install_requested():
+        projects = _git_yaml_load(projects_yaml)
+
+        if projects in GIT_DEFAULT_BRANCHES.keys():
+            if projects == 'master':
+                return 'newton'
+            return projects
+
+        if 'release' in projects:
+            if projects['release'] == 'master':
+                return 'newton'
+            return projects['release']
+
+    return None
 
 
 def git_default_repos(projects_yaml):
@@ -740,12 +757,6 @@
             }
             repos = [repo]
 
-            # NOTE(coreycb): This is a temp work-around until the requirements
-            # repo moves from stable/kilo branch to kilo-eol tag. The core
-            # repos have already done this.
-            if default == 'kilo':
-                branch = 'kilo-eol'
-
             # neutron-* and nova-* charms require some additional repos
             if service in ['neutron-api', 'neutron-gateway',
                            'neutron-openvswitch']:
@@ -778,7 +789,7 @@
             }
             repos.append(repo)
 
-            return yaml.dump(dict(repositories=repos))
+            return yaml.dump(dict(repositories=repos, release=default))
 
     return projects_yaml
 
@@ -793,6 +804,9 @@
     return yaml.load(projects_yaml)
 
 
+requirements_dir = None
+
+
 def git_clone_and_install(projects_yaml, core_project):
     """
     Clone/install all specified OpenStack repositories.
@@ -856,6 +870,10 @@
             # upper-constraints didn't exist until after icehouse
             if not os.path.isfile(constraints):
                 constraints = None
+            # use constraints unless project yaml sets use_constraints to false
+            if 'use_constraints' in projects.keys():
+                if not projects['use_constraints']:
+                    constraints = None
         else:
             repo_dir = _git_clone_and_install_single(repo, branch, depth,
                                                      parent_dir, http_proxy,
@@ -882,6 +900,8 @@
     if projects['repositories'][-1]['name'] != core_project:
         error_out('{} git repo must be specified last'.format(core_project))
 
+    _git_ensure_key_exists('release', projects)
+
 
 def _git_ensure_key_exists(key, keys):
     """

=== modified file 'tests/contrib/openstack/test_openstack_utils.py'
--- tests/contrib/openstack/test_openstack_utils.py	2016-06-30 12:41:13 +0000
+++ tests/contrib/openstack/test_openstack_utils.py	2016-07-13 12:27:09 +0000
@@ -110,14 +110,16 @@
     ('cloud:precise-icehouse/updates', url + ' precise-updates/icehouse main'),
 ]
 
-openstack_origin_git = \
-    """repositories:
-         - {name: requirements,
-            repository: 'git://git.openstack.org/openstack/requirements',
-            branch: stable/juno}
-         - {name: keystone,
-            repository: 'git://git.openstack.org/openstack/keystone',
-            branch: stable/juno}"""
+openstack_origin_git = """
+  release: master
+  repositories:
+    - {name: requirements,
+       repository: 'git://git.openstack.org/openstack/requirements',
+       branch: master}
+    - {name: keystone,
+       repository: 'git://git.openstack.org/openstack/keystone',
+       branch: master}
+"""
 
 # Mock python-dnspython resolver used by get_host_ip()
 
@@ -405,9 +407,16 @@
             )
 
     @patch.object(openstack, 'get_os_codename_package')
-    def test_os_release_uncached(self, get_cn):
+    @patch.object(openstack, 'git_os_codename_install_source')
+    @patch('charmhelpers.contrib.openstack.utils.config')
+    def test_os_release_uncached(self, config, git_cn, get_cn):
         openstack.os_rel = None
         get_cn.return_value = 'folsom'
+        git_cn.return_value = None
+
+        # openstack-origin-git=None
+        config.side_effect = [None]
+
         self.assertEquals('folsom', openstack.os_release('nova-common'))
 
     def test_os_release_cached(self):
@@ -744,29 +753,32 @@
           repostories:
              - {name: requirements,
                 repository: 'git://git.openstack.org/openstack/requirements',
-                branch: stable/juno}
+                branch: master}
              - {name: keystone,
                 repository: 'git://git.openstack.org/openstack/keystone',
-                branch: stable/juno}"""
+                branch: master}
+          release: master"""
         self._test_key_error(git_missing_repos, 'repositories', error_out)
 
         git_missing_name = """
           repositories:
              - {name: requirements,
                 repository: 'git://git.openstack.org/openstack/requirements',
-                branch: stable/juno}
+                branch: master}
              - {repository: 'git://git.openstack.org/openstack/keystone',
-                branch: stable/juno}"""
+                branch: master}
+          release: master"""
         self._test_key_error(git_missing_name, 'name', error_out)
 
         git_missing_repo = """
           repositories:
              - {name: requirements,
                 repoistroy: 'git://git.openstack.org/openstack/requirements',
-                branch: stable/juno}
+                branch: master}
              - {name: keystone,
                 repository: 'git://git.openstack.org/openstack/keystone',
-                branch: stable/juno}"""
+                branch: master}
+          release: master"""
         self._test_key_error(git_missing_repo, 'repository', error_out)
 
         git_missing_branch = """
@@ -775,17 +787,19 @@
                 repository: 'git://git.openstack.org/openstack/requirements'}
              - {name: keystone,
                 repository: 'git://git.openstack.org/openstack/keystone',
-                branch: stable/juno}"""
+                branch: master}
+          release: master"""
         self._test_key_error(git_missing_branch, 'branch', error_out)
 
         git_wrong_order_1 = """
           repositories:
              - {name: keystone,
                 repository: 'git://git.openstack.org/openstack/keystone',
-                branch: stable/juno}
+                branch: master}
              - {name: requirements,
                 repository: 'git://git.openstack.org/openstack/requirements',
-                branch: stable/juno}"""
+                branch: master}
+          release: master"""
         openstack.git_clone_and_install(git_wrong_order_1, 'keystone')
         error_out.assert_called_with(
             'keystone git repo must be specified last')
@@ -794,7 +808,8 @@
           repositories:
              - {name: keystone,
                 repository: 'git://git.openstack.org/openstack/keystone',
-                branch: stable/juno}"""
+                branch: master}
+          release: master"""
         openstack.git_clone_and_install(git_wrong_order_2, 'keystone')
         error_out.assert_called_with(
             'requirements git repo must be specified first')
@@ -822,10 +837,10 @@
         self.assertTrue(_git_install_single.call_count == 2)
         expected = [
             call('git://git.openstack.org/openstack/requirements',
-                 'stable/juno', '1', '/mnt/openstack-git', None,
+                 'master', '1', '/mnt/openstack-git', None,
                  update_requirements=False),
             call('git://git.openstack.org/openstack/keystone',
-                 'stable/juno', '1', '/mnt/openstack-git', None,
+                 'master', '1', '/mnt/openstack-git', None,
                  update_requirements=True, constraints=None)
         ]
         self.assertEquals(expected, _git_install_single.call_args_list)