Merge lp:~gnuoy/charms/precise/nova-cloud-controller/cell-support into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Liam Young]

Add support for nova cells

[lp:~gnuoy/charms/precise/nova-cloud-controller/cell-support]

104. By Liam Young on 2014-09-30

Remove duplicate LogLevelContext definition

105. By Liam Young on 2014-10-07

Explicitly set nova url for cells to use

106. By Liam Young on 2014-10-07

Merged next in

=== modified file 'config.yaml'
--- config.yaml	2014-10-06 21:01:49 +0000
+++ config.yaml	2014-10-07 11:37:42 +0000
@@ -243,6 +243,14 @@
     default: 'en-us'
     description: |
        Console keymap
+  debug:
+    default: False
+    type: boolean
+    description: Enable debug logging
+  verbose:
+    default: False
+    type: boolean
+    description: Enable verbose logging
   worker-multiplier:
     type: int
     default: 2

=== added symlink 'hooks/cell-relation-broken'
=== target is u'nova_cc_hooks.py'
=== added symlink 'hooks/cell-relation-changed'
=== target is u'nova_cc_hooks.py'
=== added symlink 'hooks/cell-relation-joined'
=== target is u'nova_cc_hooks.py'
=== modified file 'hooks/nova_cc_context.py'
--- hooks/nova_cc_context.py	2014-09-30 06:48:02 +0000
+++ hooks/nova_cc_context.py	2014-10-07 11:37:42 +0000
@@ -41,6 +41,24 @@
         return super(ApacheSSLContext, self).__call__()
 
 
+class NovaCellContext(context.OSContextGenerator):
+    interfaces = ['nova-cell']
+
+    def __call__(self):
+        log('Generating template context for cell')
+        ctxt = {}
+        for rid in relation_ids('cell'):
+            for unit in related_units(rid):
+                rdata = relation_get(rid=rid, unit=unit)
+                ctxt = {
+                    'cell_type': rdata.get('cell_type'),
+                    'cell_name': rdata.get('cell_name'),
+                }
+                if context.context_complete(ctxt):
+                    return ctxt
+        return {}
+
+
 class NeutronAPIContext(context.OSContextGenerator):
 
     def __call__(self):

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2014-10-02 09:22:36 +0000
+++ hooks/nova_cc_hooks.py	2014-10-07 11:37:42 +0000
@@ -51,7 +51,8 @@
 )
 
 from nova_cc_context import (
-    NeutronAPIContext
+    NeutronAPIContext,
+    NovaCellContext,
 )
 
 from charmhelpers.contrib.peerstorage import (
@@ -188,6 +189,8 @@
             CONFIGS.write(QUANTUM_CONF)
         if network_manager() == 'neutron':
             CONFIGS.write(NEUTRON_CONF)
+    [nova_cell_relation_joined(rid=rid)
+        for rid in relation_ids('cell')]
 
 
 def conditional_neutron_migration():
@@ -289,7 +292,10 @@
         migrate_nova_database()
         log('Triggering remote cloud-compute restarts.')
         [compute_joined(rid=rid, remote_restart=True)
-         for rid in relation_ids('cloud-compute')]
+            for rid in relation_ids('cloud-compute')]
+        log('Triggering remote cell restarts.')
+        [nova_cell_relation_joined(rid=rid, remote_restart=True)
+            for rid in relation_ids('cell')]
         conditional_neutron_migration()
 
 
@@ -714,6 +720,8 @@
                active=config('service-guard'))
 def relation_broken():
     CONFIGS.write_all()
+    [nova_cell_relation_joined(rid=rid)
+        for rid in relation_ids('cell')]
 
 
 def configure_https():
@@ -772,6 +780,31 @@
             compute_changed(r_id, unit)
 
 
+# remote_restart is defaulted to true as nova-cells may have started the
+# nova-cell process before the db migration was run so it will need a
+# kick
[e-mail]('cell-relation-joined')
+def nova_cell_relation_joined(rid=None, remote_restart=True):
+    rel_settings = {
+        'nova_url': canonical_url(CONFIGS, INTERNAL) + ":8774/v2"
+    }
+    if remote_restart:
+        rel_settings['restart_trigger'] = str(uuid.uuid4())
+    relation_set(relation_id=rid, **rel_settings)
+
+
[e-mail]('cell-relation-changed')
+def nova_cell_relation_changed():
+    CONFIGS.write(NOVA_CONF)
+
+
+def get_cell_type():
+    cell_info = NovaCellContext()()
+    if 'cell_type' in cell_info:
+        return cell_info['cell_type']
+    return None
+
+
 @hooks.hook('neutron-api-relation-joined')
 def neutron_api_relation_joined(rid=None, remote_restart=False):
     with open('/etc/init/neutron-server.override', 'wb') as out:
@@ -785,6 +818,8 @@
     rel_settings = {
         'nova_url': canonical_url(CONFIGS, INTERNAL) + ":8774/v2"
     }
+    if get_cell_type():
+        rel_settings['cell_type'] = get_cell_type()
     if remote_restart:
         rel_settings['restart_trigger'] = str(uuid.uuid4())
     relation_set(relation_id=rid, **rel_settings)

=== modified file 'hooks/nova_cc_utils.py'
--- hooks/nova_cc_utils.py	2014-10-03 07:43:40 +0000
+++ hooks/nova_cc_utils.py	2014-10-07 11:37:42 +0000
@@ -115,7 +115,9 @@
                          interface='nova-vmware',
                          service='nova',
                          config_file=NOVA_CONF),
+                     nova_cc_context.NovaCellContext(),
                      context.SyslogContext(),
+                     context.LogLevelContext(),
                      nova_cc_context.HAProxyContext(),
                      nova_cc_context.IdentityServiceContext(),
                      nova_cc_context.VolumeServiceContext(),

=== modified file 'metadata.yaml'
--- metadata.yaml	2014-05-15 07:25:56 +0000
+++ metadata.yaml	2014-10-07 11:37:42 +0000
@@ -32,6 +32,8 @@
     interface: quantum
   neutron-api:
     interface: neutron-api
+  cell:
+    interface: nova-cell
   ha:
     interface: hacluster
     scope: container

=== modified file 'templates/icehouse/nova.conf'
--- templates/icehouse/nova.conf	2014-09-25 04:01:20 +0000
+++ templates/icehouse/nova.conf	2014-10-07 11:37:42 +0000
@@ -4,6 +4,8 @@
 # Configuration file maintained by Juju. Local changes may be overwritten.
 ###############################################################################
 [DEFAULT]
+verbose={{ verbose }}
+debug={{ debug }}
 dhcpbridge_flagfile=/etc/nova/nova.conf
 dhcpbridge=/usr/bin/nova-dhcpbridge
 logdir=/var/log/nova
@@ -14,7 +16,6 @@
 libvirt_use_virtio_for_bridges=True
 connection_type=libvirt
 root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
-verbose=True
 ec2_private_dns_show_ip=True
 api_paste_config=/etc/nova/api-paste.ini
 volumes_path=/var/lib/nova/volumes
@@ -145,5 +146,7 @@
 [osapi_v3]
 enabled=True
 
+{% include "parts/cell" %}
+
 [conductor]
 workers = {{ workers }}

=== added file 'templates/parts/cell'
--- templates/parts/cell	1970-01-01 00:00:00 +0000
+++ templates/parts/cell	2014-10-07 11:37:42 +0000
@@ -0,0 +1,6 @@
+{% if cell_type -%}
+[cells]
+enable=True
+name={{ cell_name }}
+cell_type={{ cell_type }}
+{% endif -%}

=== modified file 'unit_tests/test_nova_cc_hooks.py'
--- unit_tests/test_nova_cc_hooks.py	2014-10-02 09:22:36 +0000
+++ unit_tests/test_nova_cc_hooks.py	2014-10-07 11:37:42 +0000
@@ -35,6 +35,7 @@
     'determine_ports',
     'disable_services',
     'enable_services',
+    'NovaCellContext',
     'open_port',
     'is_relation_made',
     'local_unit',
@@ -55,6 +56,7 @@
     'network_manager',
     'volume_service',
     'unit_get',
+    'uuid',
     'eligible_leader',
     'keystone_ca_cert_b64',
     'neutron_plugin',
@@ -371,17 +373,99 @@
         self.assertTrue(configs.write_all.called)
         self.migrate_nova_database.assert_called_with()
 
+    @patch.object(hooks, 'nova_cell_relation_joined')
+    @patch.object(hooks, 'compute_joined')
+    @patch.object(hooks, 'CONFIGS')
+    def test_db_changed_remote_restarts(self, configs, comp_joined,
+                                        cell_joined):
+        def _relation_ids(rel):
+            relid = {
+                'cloud-compute': ['nova-compute/0'],
+                'cell': ['nova-cell-api/0'],
+                'neutron-api': ['neutron-api/0'],
+            }
+            return relid[rel]
+        self.relation_ids.side_effect = _relation_ids
+        allowed_units = 'nova-cloud-controller/0'
+        self.test_relation.set({
+            'nova_allowed_units': allowed_units,
+        })
+        self.local_unit.return_value = 'nova-cloud-controller/0'
+        self._shared_db_test(configs)
+        comp_joined.assert_called_with(remote_restart=True,
+                                       rid='nova-compute/0')
+        cell_joined.assert_called_with(remote_restart=True,
+                                       rid='nova-cell-api/0')
+        self.migrate_nova_database.assert_called_with()
+
+    @patch.object(hooks, 'nova_cell_relation_joined')
+    @patch.object(hooks, 'CONFIGS')
+    def test_amqp_relation_broken(self, configs, cell_joined):
+        configs.write = MagicMock()
+        self.relation_ids.return_value = ['nova-cell-api/0']
+        hooks.relation_broken()
+        self.assertTrue(configs.write_all.called)
+        cell_joined.assert_called_with(rid='nova-cell-api/0')
+
+    @patch.object(hooks, 'nova_cell_relation_joined')
+    @patch.object(hooks, 'CONFIGS')
+    def test_amqp_changed_api_rel(self, configs, cell_joined):
+        configs.complete_contexts = MagicMock()
+        configs.complete_contexts.return_value = ['amqp']
+        configs.write = MagicMock()
+        self.is_relation_made.return_value = True
+        hooks.amqp_changed()
+        self.assertEquals(configs.write.call_args_list,
+                          [call('/etc/nova/nova.conf')])
+
+    @patch.object(hooks, 'nova_cell_relation_joined')
+    @patch.object(hooks, 'CONFIGS')
+    def test_amqp_changed_noapi_rel(self, configs, cell_joined):
+        configs.complete_contexts = MagicMock()
+        configs.complete_contexts.return_value = ['amqp']
+        configs.write = MagicMock()
+        self.relation_ids.return_value = ['nova-cell-api/0']
+        self.is_relation_made.return_value = False
+        self.network_manager.return_value = 'neutron'
+        hooks.amqp_changed()
+        self.assertEquals(configs.write.call_args_list,
+                          [call('/etc/nova/nova.conf'),
+                           call('/etc/neutron/neutron.conf')])
+        cell_joined.assert_called_with(rid='nova-cell-api/0')
+
+    def test_nova_cell_relation_joined(self):
+        self.uuid.uuid4.return_value = 'bob'
+        hooks.nova_cell_relation_joined(rid='rid',
+                                        remote_restart=True)
+        self.relation_set.assert_called_with(restart_trigger='bob',
+                                             relation_id='rid')
+
+    @patch.object(hooks, 'CONFIGS')
+    def test_nova_cell_relation_changed(self, configs):
+        hooks.nova_cell_relation_changed()
+        configs.write.assert_called_with('/etc/nova/nova.conf')
+
+    def test_get_cell_type(self):
+        self.NovaCellContext().return_value = {
+            'cell_type': 'parent',
+            'cell_name': 'api',
+        }
+        self.assertEquals(hooks.get_cell_type(), 'parent')
+
     @patch.object(os, 'rename')
     @patch.object(os.path, 'isfile')
     @patch.object(hooks, 'CONFIGS')
-    def test_neutron_api_relation_joined(self, configs, isfile, rename):
+    @patch.object(hooks, 'get_cell_type')
+    def test_neutron_api_relation_joined(self, get_cell_type, configs, isfile,
+                                         rename):
         neutron_conf = '/etc/neutron/neutron.conf'
         nova_url = 'http://novaurl:8774/v2'
         isfile.return_value = True
         self.service_running.return_value = True
         _identity_joined = self.patch('identity_joined')
-        self.relation_ids.side_effect = ['relid']
+        self.relation_ids.return_value = ['relid']
         self.canonical_url.return_value = 'http://novaurl'
+        get_cell_type.return_value = 'parent'
         self.uuid.uuid4.return_value = 'bob'
         with patch_open() as (_open, _file):
             hooks.neutron_api_relation_joined(remote_restart=True)
@@ -389,6 +473,7 @@
             rename.assert_called_with(neutron_conf, neutron_conf + '_unused')
             self.assertTrue(_identity_joined.called)
             self.relation_set.assert_called_with(relation_id=None,
+                                                 cell_type='parent',
                                                  nova_url=nova_url,
                                                  restart_trigger='bob')