Merge lp:~gnuoy/charms/trusty/nova-cloud-controller/next-multi-console-fix into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Liam Young]

[Yaguang Tang (heut2008)]

review: Approve

[Yaguang Tang (heut2008)]

I think in the future, may be it's better to have memcached service cache tokens, and so it's more scaleable.

[James Page (james-page)]

I'm not sure this is quite the right fix; I think the nova-consoleauth service should either be run in the cluster as a singleton, or we should use memcached across the cluster.

review: Needs Information

Unmerged revisions

98. By Liam Young on 2014-09-06

Only run one console proxy as each proxy will reject the others tokens

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2014-09-04 09:20:50 +0000
+++ hooks/nova_cc_hooks.py	2014-09-06 07:11:11 +0000
@@ -581,6 +581,9 @@
             CONFIGS.write(NEUTRON_CONF)
 
     if not is_leader(CLUSTER_RES):
+        if console_attributes('protocol'):
+            for service in console_attributes('services'):
+                service_stop(service)
         log('ha_changed: hacluster complete but we are not leader.')
         return
     log('Cluster configured, notifying other services and updating '

=== modified file 'hooks/nova_cc_utils.py'
--- hooks/nova_cc_utils.py	2014-07-29 14:42:08 +0000
+++ hooks/nova_cc_utils.py	2014-09-06 07:11:11 +0000
@@ -256,7 +256,7 @@
     if os_release('nova-common') not in ['essex', 'folsom']:
         resource_map['/etc/nova/nova.conf']['services'] += ['nova-conductor']
 
-    if console_attributes('services'):
+    if console_attributes('services') and eligible_leader(CLUSTER_RES):
         resource_map['/etc/nova/nova.conf']['services'] += \
             console_attributes('services')
 

=== modified file 'unit_tests/test_nova_cc_utils.py'
--- unit_tests/test_nova_cc_utils.py	2014-07-29 14:42:08 +0000
+++ unit_tests/test_nova_cc_utils.py	2014-09-06 07:11:11 +0000
@@ -256,6 +256,16 @@
         for service in console_services:
             self.assertIn(service, _map['/etc/nova/nova.conf']['services'])
 
+    @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
+    def test_resource_map_console_notleader(self, subcontext):
+        self.test_config.set('console-access-protocol', 'spice')
+        self.eligible_leader.return_value = False
+        self.relation_ids.return_value = []
+        _map = utils.resource_map()
+        console_services = ['nova-spiceproxy', 'nova-consoleauth']
+        for service in console_services:
+            self.assertNotIn(service, _map['/etc/nova/nova.conf']['services'])
+
     @patch('os.path.exists')
     @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
     def test_restart_map_api_before_frontends(self, subcontext, _exists):