Merge lp:~james-page/charms/trusty/cinder/lp1521604 into lp:~openstack-charmers-archive/charms/trusty/cinder/next

[James Page]

Drop requirement for identity service unless api service is enabled.

[lp:~james-page/charms/trusty/cinder/lp1521604]

141. By James Page on 2016-01-06

Also avoid overwrite of actual endpoint information for service instances where api service is not enabled

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

charm_lint_check #16668 cinder-next for james-page mp281799
    LINT FAIL: lint-test failed

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

Full lint test output: http://paste.ubuntu.com/14424371/
Build: http://10.245.162.77:8080/job/charm_lint_check/16668/

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

charm_unit_test #15565 cinder-next for james-page mp281799
    UNIT OK: passed

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

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

charm_amulet_test #8544 cinder-next for james-page mp281799
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8544/

[lp:~james-page/charms/trusty/cinder/lp1521604]

142. By James Page on 2016-01-07

Tidy lint

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

charm_lint_check #16726 cinder-next for james-page mp281799
    LINT OK: passed

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

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

charm_unit_test #15620 cinder-next for james-page mp281799
    UNIT OK: passed

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

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

charm_amulet_test #8551 cinder-next for james-page mp281799
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8551/

[Liam Young (gnuoy)]

LGTM, approved

review: Approve

=== modified file 'hooks/cinder_hooks.py'
--- hooks/cinder_hooks.py	2015-10-08 14:28:50 +0000
+++ hooks/cinder_hooks.py	2016-01-07 09:37:49 +0000
@@ -27,7 +27,7 @@
     setup_ipv6,
     check_db_initialised,
     filesystem_mounted,
-    REQUIRED_INTERFACES,
+    required_interfaces,
     check_optional_relations,
 )
 
@@ -270,6 +270,10 @@
 
 @hooks.hook('identity-service-relation-joined')
 def identity_joined(rid=None):
+    if not service_enabled('api'):
+        juju_log('api service not enabled; skipping endpoint registration')
+        return
+
     public_url = '{}:{}/v1/$(tenant_id)s'.format(
         canonical_url(CONFIGS, PUBLIC),
         config('api-listening-port')
@@ -553,5 +557,5 @@
         hooks.execute(sys.argv)
     except UnregisteredHookError as e:
         juju_log('Unknown hook {} - skipping.'.format(e))
-    set_os_workload_status(CONFIGS, REQUIRED_INTERFACES,
+    set_os_workload_status(CONFIGS, required_interfaces(),
                            charm_func=check_optional_relations)

=== modified file 'hooks/cinder_utils.py'
--- hooks/cinder_utils.py	2015-10-08 14:28:50 +0000
+++ hooks/cinder_utils.py	2016-01-07 09:37:49 +0000
@@ -168,6 +168,15 @@
 }
 
 
+def required_interfaces():
+    '''Provide the required charm interfaces based on configured roles.'''
+    _interfaces = copy(REQUIRED_INTERFACES)
+    if not service_enabled('api'):
+        # drop requirement for identity interface
+        _interfaces.pop('identity')
+    return _interfaces
+
+
 def ceph_config_file():
     return CHARM_CEPH_CONF.format(service_name())
 

=== modified file 'unit_tests/test_cinder_hooks.py'
--- unit_tests/test_cinder_hooks.py	2015-10-29 04:46:01 +0000
+++ unit_tests/test_cinder_hooks.py	2016-01-07 09:37:49 +0000
@@ -485,6 +485,14 @@
         }
         self.relation_set.assert_called_with(**expected)
 
+    def test_identity_service_joined_no_api(self):
+        'endpoint registration is skipped if api service is not enabled'
+        self.config.side_effect = self.test_config.get
+        self.service_enabled.return_value = False
+        hooks.hooks.execute(['hooks/identity-service-relation-joined'])
+        self.assertFalse(self.relation_set.called)
+        self.service_enabled.assert_called_with('api')
+
     @patch.object(hooks, 'canonical_url')
     def test_identity_service_joined_icehouse(self, _canonical_url):
         'It properly requests unclustered endpoint via identity-service'

=== modified file 'unit_tests/test_cinder_utils.py'
--- unit_tests/test_cinder_utils.py	2015-10-01 13:38:52 +0000
+++ unit_tests/test_cinder_utils.py	2016-01-07 09:37:49 +0000
@@ -805,3 +805,24 @@
         volume_group = "test"
         cinder_utils.remove_lvm_volume_group(volume_group)
         _check.assert_called_with(['vgremove', '--force', volume_group])
+
+    def test_required_interfaces_api(self):
+        '''identity-service interface required for api service'''
+        expected = {
+            'database': ['shared-db', 'pgsql-db'],
+            'messaging': ['amqp'],
+            'identity': ['identity-service'],
+        }
+        self.assertEqual(cinder_utils.required_interfaces(), expected)
+
+    def test_required_interfaces_no_api(self):
+        '''
+        identity-service interface not required for volume
+        or scheduler service
+        '''
+        self.test_config.set('enabled-services', 'volume,scheduler')
+        expected = {
+            'database': ['shared-db', 'pgsql-db'],
+            'messaging': ['amqp'],
+        }
+        self.assertEqual(cinder_utils.required_interfaces(), expected)