Merge lp:~hopem/charms/trusty/cinder/default-to-glance-v2-api into lp:~openstack-charmers-archive/charms/trusty/cinder/next

[Edward Hope-Morley]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #18508 cinder-next for hopem mp284752
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/18508/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #17244 cinder-next for hopem mp284752
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/17244/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #9154 cinder-next for hopem mp284752
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/14859709/
Build: http://10.245.162.77:8080/job/charm_amulet_test/9154/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #120 cinder-next for hopem mp284752
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/120/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #129 cinder-next for hopem mp284752
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/129/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #17 cinder-next for hopem mp284752
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/17/

[James Page (james-page)]

If icehouse supports glance v2, lets just default it in the template to v2 and drop the config option and related code please.

[James Page (james-page)]

Please re-target to git/gerrit

Unmerged revisions

56. By Edward Hope-Morley on 2016-02-02

Use v2 glance api by default

Cinder requires the v2 glance api to perform operations like COW
cloning images so lets use it by default.

Closes-Bug: 1262125

=== modified file 'config.yaml'
--- config.yaml	2015-12-03 22:58:37 +0000
+++ config.yaml	2016-02-02 16:07:24 +0000
@@ -143,7 +143,7 @@
     type: string
     description: OpenStack Region
   glance-api-version:
-    default: 1
+    default: 2
     type: int
     description: |
       Newer storage drivers may require the v2 Glance API to perform certain

=== modified file 'hooks/cinder_contexts.py'
--- hooks/cinder_contexts.py	2015-09-30 11:07:30 +0000
+++ hooks/cinder_contexts.py	2016-02-02 16:07:24 +0000
@@ -5,6 +5,7 @@
     related_units,
     relation_get,
     log,
+    INFO,
     WARNING,
 )
 
@@ -15,7 +16,8 @@
 )
 
 from charmhelpers.contrib.openstack.utils import (
-    get_os_codename_install_source
+    get_os_codename_install_source,
+    os_release,
 )
 
 from charmhelpers.contrib.hahelpers.cluster import (
@@ -30,7 +32,13 @@
     def __call__(self):
         if not relation_ids('image-service'):
             return {}
-        return {'glance_api_version': config('glance-api-version')}
+
+        g_api_version = config('glance-api-version')
+        if g_api_version > 1 and os_release('cinder-common') == "essex":
+            log("Setting Glance API version to 1", level=INFO)
+            g_api_version = 1
+
+        return {'glance_api_version': g_api_version}
 
 
 class CephContext(OSContextGenerator):

=== modified file 'unit_tests/test_cinder_contexts.py'
--- unit_tests/test_cinder_contexts.py	2015-09-11 10:36:23 +0000
+++ unit_tests/test_cinder_contexts.py	2016-02-02 16:07:24 +0000
@@ -31,17 +31,29 @@
         self.relation_ids.return_value = []
         self.assertEquals(contexts.ImageServiceContext()(), {})
 
-    def test_glance_related(self):
-        self.relation_ids.return_value = ['image-service:0']
-        self.config.return_value = '1'
-        self.assertEquals(contexts.ImageServiceContext()(),
-                          {'glance_api_version': '1'})
-
-    def test_glance_related_api_v2(self):
-        self.relation_ids.return_value = ['image-service:0']
-        self.config.return_value = '2'
-        self.assertEquals(contexts.ImageServiceContext()(),
-                          {'glance_api_version': '2'})
+    @patch.object(contexts, 'os_release')
+    def test_glance_related(self, mock_os_release):
+        mock_os_release.return_value = "liberty"
+        self.relation_ids.return_value = ['image-service:0']
+        self.config.return_value = 1
+        self.assertEquals(contexts.ImageServiceContext()(),
+                          {'glance_api_version': 1})
+
+    @patch.object(contexts, 'os_release')
+    def test_glance_related_api_v2(self, mock_os_release):
+        mock_os_release.return_value = "liberty"
+        self.relation_ids.return_value = ['image-service:0']
+        self.config.return_value = 2
+        self.assertEquals(contexts.ImageServiceContext()(),
+                          {'glance_api_version': 2})
+
+    @patch.object(contexts, 'os_release')
+    def test_glance_related_api_v2_unsupported(self, mock_os_release):
+        mock_os_release.return_value = "essex"
+        self.relation_ids.return_value = ['image-service:0']
+        self.config.return_value = 2
+        self.assertEquals(contexts.ImageServiceContext()(),
+                          {'glance_api_version': 1})
 
     def test_ceph_not_related(self):
         self.relation_ids.return_value = []