Merge lp:~james-page/charms/trusty/neutron-api/lp-1469621-stable into lp:~openstack-charmers-archive/charms/trusty/neutron-api/trunk

[James Page]

Ensure that only the leader upgrades the database.

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

charm_lint_check #5732 neutron-api for james-page mp263793
    LINT OK: passed

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

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

charm_unit_test #5364 neutron-api for james-page mp263793
    UNIT OK: passed

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

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

charm_amulet_test #4930 neutron-api for james-page mp263793
    AMULET OK: passed

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

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

charm_lint_check #7753 neutron-api for james-page mp263793
    LINT OK: passed

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

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

charm_unit_test #7187 neutron-api for james-page mp263793
    UNIT OK: passed

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

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

charm_lint_check #12360 neutron-api for james-page mp263793
    LINT FAIL: lint-test failed
    LINT FAIL: charm-proof failed

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

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

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

charm_unit_test #11465 neutron-api for james-page mp263793
    UNIT OK: passed

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

Unmerged revisions

115. By James Page on 2015-07-03

Backport fix for lp:1469621 to stable branch

=== modified file 'hooks/neutron_api_utils.py'
--- hooks/neutron_api_utils.py	2015-04-23 08:50:42 +0000
+++ hooks/neutron_api_utils.py	2015-07-03 15:18:40 +0000
@@ -42,6 +42,7 @@
 )
 
 from charmhelpers.core.templating import render
+from charmhelpers.contrib.hahelpers.cluster import is_elected_leader
 
 import neutron_api_context
 
@@ -282,7 +283,7 @@
     # set CONFIGS to load templates from new release
     configs.set_release(openstack_release=new_os_rel)
     # Before kilo it's nova-cloud-controllers job
-    if new_os_rel >= 'kilo':
+    if is_elected_leader(CLUSTER_RES) and new_os_rel >= 'kilo':
         stamp_neutron_database(cur_os_rel)
         migrate_neutron_database()
 

=== modified file 'unit_tests/test_neutron_api_utils.py'
--- unit_tests/test_neutron_api_utils.py	2015-04-23 07:35:40 +0000
+++ unit_tests/test_neutron_api_utils.py	2015-07-03 15:18:40 +0000
@@ -32,6 +32,7 @@
     'neutron_plugin_attribute',
     'os_release',
     'subprocess',
+    'is_elected_leader',
 ]
 
 openstack_origin_git = \
@@ -189,6 +190,7 @@
     def test_do_openstack_upgrade_juno(self, git_requested,
                                        stamp_neutron_db, migrate_neutron_db):
         git_requested.return_value = False
+        self.is_elected_leader.return_value = True
         self.config.side_effect = self.test_config.get
         self.test_config.set('openstack-origin', 'cloud:trusty-juno')
         self.os_release.return_value = 'icehouse'
@@ -226,6 +228,7 @@
                                        stamp_neutron_db, migrate_neutron_db,
                                        gsrc):
         git_requested.return_value = False
+        self.is_elected_leader.return_value = True
         self.os_release.return_value = 'juno'
         self.config.side_effect = self.test_config.get
         self.test_config.set('openstack-origin', 'cloud:trusty-kilo')
@@ -255,6 +258,46 @@
         stamp_neutron_db.assert_called_with('juno')
         migrate_neutron_db.assert_called_with()
 
+    @patch.object(charmhelpers.contrib.openstack.utils,
+                  'get_os_codename_install_source')
+    @patch.object(nutils, 'migrate_neutron_database')
+    @patch.object(nutils, 'stamp_neutron_database')
+    @patch.object(nutils, 'git_install_requested')
+    def test_do_openstack_upgrade_kilo_notleader(self, git_requested,
+                                                 stamp_neutron_db,
+                                                 migrate_neutron_db,
+                                                 gsrc):
+        git_requested.return_value = False
+        self.is_elected_leader.return_value = False
+        self.os_release.return_value = 'juno'
+        self.config.side_effect = self.test_config.get
+        self.test_config.set('openstack-origin', 'cloud:trusty-kilo')
+        gsrc.return_value = 'kilo'
+        self.get_os_codename_install_source.return_value = 'kilo'
+        configs = MagicMock()
+        nutils.do_openstack_upgrade(configs)
+        self.os_release.assert_called_with('neutron-server')
+        self.log.assert_called()
+        self.configure_installation_source.assert_called_with(
+            'cloud:trusty-kilo'
+        )
+        self.apt_update.assert_called_with(fatal=True)
+        dpkg_opts = [
+            '--option', 'Dpkg::Options::=--force-confnew',
+            '--option', 'Dpkg::Options::=--force-confdef',
+        ]
+        self.apt_upgrade.assert_called_with(options=dpkg_opts,
+                                            fatal=True,
+                                            dist=True)
+        pkgs = nutils.determine_packages()
+        pkgs.sort()
+        self.apt_install.assert_called_with(packages=pkgs,
+                                            options=dpkg_opts,
+                                            fatal=True)
+        configs.set_release.assert_called_with(openstack_release='kilo')
+        self.assertFalse(stamp_neutron_db.called)
+        self.assertFalse(migrate_neutron_db.called)
+
     @patch.object(ncontext, 'IdentityServiceContext')
     @patch('neutronclient.v2_0.client.Client')
     def test_get_neutron_client(self, nclient, IdentityServiceContext):