Merge lp:~billy-olsen/charms/trusty/nova-cloud-controller/1468306 into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Billy Olsen]

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

charm_lint_check #660 nova-cloud-controller-next for billy-olsen mp286221
    LINT OK: passed

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

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

charm_unit_test #571 nova-cloud-controller-next for billy-olsen mp286221
    UNIT OK: passed

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

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

charm_amulet_test #267 nova-cloud-controller-next for billy-olsen mp286221
    AMULET OK: passed

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

[James Page (james-page)]

Billy - looks OK just a couple of niggles

review: Needs Fixing

[lp:~billy-olsen/charms/trusty/nova-cloud-controller/1468306]

216. By Billy Olsen on 2016-02-17

Merge with trunk.

217. By Billy Olsen on 2016-02-17

Update code with feedback from code review:

1. Rebase
2. Update the new mitaka/nova.conf template
3. Add related_unit call to get the units

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

charm_lint_check #919 nova-cloud-controller-next for billy-olsen mp286221
    LINT OK: passed

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

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

charm_unit_test #818 nova-cloud-controller-next for billy-olsen mp286221
    UNIT OK: passed

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

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

charm_amulet_test #367 nova-cloud-controller-next for billy-olsen mp286221
    AMULET OK: passed

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

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2016-02-16 21:52:04 +0000
+++ hooks/nova_cc_hooks.py	2016-02-19 16:18:10 +0000
@@ -265,6 +265,13 @@
     [cluster_joined(rid) for rid in relation_ids('cluster')]
     update_nrpe_config()
 
+    # If the region value has changed, notify the cloud-compute relations
+    # to ensure the value is propagated to the compute nodes.
+    if config_value_changed('region'):
+        for rid in relation_ids('cloud-compute'):
+            for unit in related_units(rid):
+                compute_changed(rid, unit)
+
     update_nova_consoleauth_config()
 
 
@@ -604,6 +611,7 @@
         # (comment from bash vers) XXX Should point to VIP if clustered, or
         # this may not even be needed.
         'ec2_host': unit_get('private-address'),
+        'region': config('region')
     }
     # update relation setting if we're attempting to restart remote
     # services
@@ -617,6 +625,8 @@
 @hooks.hook('cloud-compute-relation-changed')
 def compute_changed(rid=None, unit=None):
     rel_settings = relation_get(rid=rid, unit=unit)
+    if not rel_settings.get('region', None) == config('region'):
+        relation_set(relation_id=rid, region=config('region'))
     if 'migration_auth_type' not in rel_settings:
         return
     if rel_settings['migration_auth_type'] == 'ssh':

=== modified file 'templates/icehouse/nova.conf'
--- templates/icehouse/nova.conf	2015-09-17 20:15:37 +0000
+++ templates/icehouse/nova.conf	2016-02-19 16:18:10 +0000
@@ -130,6 +130,9 @@
 
 {% if volume_service -%}
 volume_api_class=nova.volume.cinder.API
+{% if volume_service == 'cinder' -%}
+os_region_name = {{ region }}
+{% endif -%}
 {% endif -%}
 
 {% if user_config_flags -%}

=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2016-01-11 17:47:12 +0000
+++ templates/juno/nova.conf	2016-02-19 16:18:10 +0000
@@ -163,6 +163,8 @@
 admin_password = {{ admin_password }}
 {% endif -%}
 
+{% include "parts/cinder" %}
+
 [osapi_v3]
 enabled=True
 

=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	2015-09-17 20:15:37 +0000
+++ templates/kilo/nova.conf	2016-02-19 16:18:10 +0000
@@ -148,6 +148,8 @@
 
 {% include "section-keystone-authtoken" %}
 
+{% include "parts/cinder" %}
+
 [osapi_v3]
 enabled=True
 

=== modified file 'templates/mitaka/nova.conf'
--- templates/mitaka/nova.conf	2016-02-12 11:53:43 +0000
+++ templates/mitaka/nova.conf	2016-02-19 16:18:10 +0000
@@ -157,6 +157,8 @@
 region = {{ region }}
 {% endif -%}
 
+{% include "parts/cinder" %}
+
 [osapi_v3]
 enabled=True
 

=== added file 'templates/parts/cinder'
--- templates/parts/cinder	1970-01-01 00:00:00 +0000
+++ templates/parts/cinder	2016-02-19 16:18:10 +0000
@@ -0,0 +1,5 @@
+{% if volume_service and volume_service == 'cinder' -%}
+[cinder]
+os_region_name = {{ region }}
+{% endif -%}
+

=== modified file 'unit_tests/test_nova_cc_contexts.py'
--- unit_tests/test_nova_cc_contexts.py	2015-09-29 06:46:46 +0000
+++ unit_tests/test_nova_cc_contexts.py	2016-02-19 16:18:10 +0000
@@ -153,6 +153,7 @@
 
     @mock.patch.object(neutron, 'network_manager')
     @mock.patch('charmhelpers.contrib.hahelpers.cluster.https')
+    @mock.patch('charmhelpers.contrib.openstack.context.kv')
     @mock.patch('charmhelpers.contrib.openstack.context.'
                 'get_address_in_network')
     @mock.patch('charmhelpers.contrib.openstack.context.'
@@ -162,7 +163,7 @@
     @mock.patch('charmhelpers.contrib.openstack.context.relation_ids')
     def test_haproxy_context(self, mock_relation_ids, mock_get_ipv6_addr,
                              mock_local_unit, mock_get_netmask_for_address,
-                             mock_get_address_in_network, mock_https,
+                             mock_get_address_in_network, mock_kv, mock_https,
                              mock_network_manager):
         mock_network_manager.return_value = 'neutron'
         mock_https.return_value = False
@@ -172,6 +173,7 @@
 
     @mock.patch.object(neutron, 'network_manager')
     @mock.patch('charmhelpers.contrib.hahelpers.cluster.https')
+    @mock.patch('charmhelpers.contrib.openstack.context.kv')
     @mock.patch('charmhelpers.contrib.openstack.context.'
                 'get_address_in_network')
     @mock.patch('charmhelpers.contrib.openstack.context.'
@@ -183,7 +185,8 @@
                                           mock_get_ipv6_addr, mock_local_unit,
                                           mock_get_netmask_for_address,
                                           mock_get_address_in_network,
-                                          mock_https, mock_network_manager):
+                                          mock_kv, mock_https,
+                                          mock_network_manager):
         mock_network_manager.return_value = 'neutron'
         mock_https.return_value = False
         self.is_relation_made.return_value = True

=== modified file 'unit_tests/test_nova_cc_hooks.py'
--- unit_tests/test_nova_cc_hooks.py	2016-01-08 12:30:31 +0000
+++ unit_tests/test_nova_cc_hooks.py	2016-02-19 16:18:10 +0000
@@ -33,6 +33,7 @@
     'openstack_upgrade_available',
     'cmd_all_services',
     'config',
+    'config_value_changed',
     'determine_endpoints',
     'determine_packages',
     'determine_ports',
@@ -44,6 +45,7 @@
     'local_unit',
     'log',
     'os_release',
+    'related_units',
     'relation_get',
     'relation_set',
     'relation_ids',
@@ -155,9 +157,8 @@
         self.assertTrue(self.save_script_rc.called)
         mock_filter_packages.assert_called_with([])
 
-    @patch.object(hooks, 'config_value_changed')
     @patch.object(hooks, 'configure_https')
-    def test_config_changed_git(self, configure_https, config_val_changed):
+    def test_config_changed_git(self, configure_https):
         self.git_install_requested.return_value = True
         repo = 'cloud:trusty-juno'
         openstack_origin_git = {
@@ -202,10 +203,25 @@
         self.assertTrue(self.save_script_rc.called)
         mock_filter_packages.assert_called_with([])
 
+    @patch.object(hooks, 'filter_installed_packages')
+    @patch.object(hooks, 'configure_https')
+    @patch.object(hooks, 'compute_changed')
+    def test_config_changed_region_change(self, mock_compute_changed,
+                                          mock_config_https,
+                                          mock_filter_packages):
+        self.git_install_requested.return_value = False
+        self.openstack_upgrade_available.return_value = False
+        self.config_value_changed.return_value = True
+        self.related_units.return_value = ['unit/0']
+        self.relation_ids.side_effect = \
+            lambda x: ['generic_rid'] if x == 'cloud-compute' else []
+        hooks.config_changed()
+        mock_compute_changed.assert_has_calls([call('generic_rid', 'unit/0')])
+
     def test_compute_changed_ssh_migration(self):
         self.test_relation.set({
             'migration_auth_type': 'ssh', 'ssh_public_key': 'fookey',
-            'private-address': '10.0.0.1'})
+            'private-address': '10.0.0.1', 'region': 'RegionOne'})
         self.ssh_known_hosts_lines.return_value = [
             'k_h_0', 'k_h_1', 'k_h_2']
         self.ssh_authorized_keys_lines.return_value = [
@@ -233,7 +249,7 @@
     def test_compute_changed_nova_public_key(self):
         self.test_relation.set({
             'migration_auth_type': 'sasl', 'nova_ssh_public_key': 'fookey',
-            'private-address': '10.0.0.1'})
+            'private-address': '10.0.0.1', 'region': 'RegionOne'})
         self.ssh_known_hosts_lines.return_value = [
             'k_h_0', 'k_h_1', 'k_h_2']
         self.ssh_authorized_keys_lines.return_value = [
@@ -861,6 +877,7 @@
     def test_config_changed_single_consoleauth(self, mock_config,
                                                mock_configure_https,
                                                mock_filter_packages):
+        self.config_value_changed.return_value = False
         self.git_install_requested.return_value = False
         config.return_value = 'novnc'
         rids = {'ha': ['ha:1']}