Merge lp:~gnuoy/charms/trusty/keystone/lp1506397 into lp:~openstack-charmers-archive/charms/trusty/keystone/next

[Liam Young]

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

charm_lint_check #12158 keystone-next for gnuoy mp274856
    LINT OK: passed

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

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

charm_unit_test #11289 keystone-next for gnuoy mp274856
    UNIT FAIL: unit-test failed

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

Full unit test output: http://paste.ubuntu.com/12859915/
Build: http://10.245.162.77:8080/job/charm_unit_test/11289/

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

charm_amulet_test #7428 keystone-next for gnuoy mp274856
    AMULET OK: passed

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

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

charm_lint_check #12161 keystone-next for gnuoy mp274856
    LINT OK: passed

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

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

charm_unit_test #11292 keystone-next for gnuoy mp274856
    UNIT OK: passed

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

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

charm_amulet_test #7431 keystone-next for gnuoy mp274856
    AMULET OK: passed

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

[James Page (james-page)]

I think this is fine as a short-term fix to get us to release; however I'd like for us to stand back as a dev team early next cycle and see how we can de-couple the codebase we're managing from the code we're using to manage it with, as I think that is where this problem arises.

Only three charms do this afaik; keystone, swift-proxy and neutron-api.

review: Approve

=== modified file 'actions/openstack_upgrade.py'
--- actions/openstack_upgrade.py	2015-10-08 22:30:32 +0000
+++ actions/openstack_upgrade.py	2015-10-19 13:34:22 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+import os
 import sys
 
 sys.path.append('hooks/')
@@ -8,7 +9,6 @@
 )
 
 from keystone_hooks import (
-    config_changed,
     CONFIGS,
 )
 
@@ -31,7 +31,7 @@
     if (do_action_openstack_upgrade('keystone',
                                     do_openstack_upgrade,
                                     CONFIGS)):
-        config_changed()
+        os.execl('./hooks/config-changed-postupgrade', '')
 
 if __name__ == '__main__':
     openstack_upgrade()

=== added symlink 'hooks/config-changed-postupgrade'
=== target is u'keystone_hooks.py'
=== modified file 'hooks/keystone_hooks.py'
--- hooks/keystone_hooks.py	2015-10-08 22:29:33 +0000
+++ hooks/keystone_hooks.py	2015-10-19 13:34:22 +0000
@@ -53,7 +53,7 @@
 from keystone_utils import (
     add_service_to_keystone,
     determine_packages,
-    do_openstack_upgrade,
+    do_openstack_upgrade_reexec,
     ensure_initial_admin,
     get_admin_passwd,
     git_install,
@@ -152,8 +152,15 @@
     elif not config('action-managed-upgrade'):
         if openstack_upgrade_available('keystone'):
             status_set('maintenance', 'Running openstack upgrade')
-            do_openstack_upgrade(configs=CONFIGS)
-
+            do_openstack_upgrade_reexec(configs=CONFIGS)
+
+    config_changed_postupgrade()
+
+
[e-mail]('config-changed-postupgrade')
+@restart_on_change(restart_map())
+@synchronize_ca_if_changed(fatal=True)
+def config_changed_postupgrade():
     # Ensure ssl dir exists and is unison-accessible
     ensure_ssl_dir()
 

=== modified file 'hooks/keystone_utils.py'
--- hooks/keystone_utils.py	2015-10-06 19:19:34 +0000
+++ hooks/keystone_utils.py	2015-10-19 13:34:22 +0000
@@ -370,6 +370,12 @@
     _save_script_rc(**env_vars)
 
 
+def do_openstack_upgrade_reexec(configs):
+    do_openstack_upgrade(configs)
+    log("Re-execing hook to pickup upgraded packages",  level=INFO)
+    os.execl('./hooks/config-changed-postupgrade', '')
+
+
 def do_openstack_upgrade(configs):
     new_src = config('openstack-origin')
     new_os_rel = get_os_codename_install_source(new_src)
@@ -395,7 +401,6 @@
         else:
             log("Database not ready - deferring to shared-db relation",
                 level=INFO)
-            return
 
 
 def is_db_initialised():

=== modified file 'unit_tests/test_actions_openstack_upgrade.py'
--- unit_tests/test_actions_openstack_upgrade.py	2015-10-07 16:20:36 +0000
+++ unit_tests/test_actions_openstack_upgrade.py	2015-10-19 13:34:22 +0000
@@ -12,16 +12,16 @@
 )
 
 TO_PATCH = [
-    'config_changed',
     'do_openstack_upgrade',
+    'os',
 ]
 
 
-class TestCinderUpgradeActions(CharmTestCase):
+class TestKeystoneUpgradeActions(CharmTestCase):
 
     def setUp(self):
-        super(TestCinderUpgradeActions, self).setUp(openstack_upgrade,
-                                                    TO_PATCH)
+        super(TestKeystoneUpgradeActions, self).setUp(openstack_upgrade,
+                                                      TO_PATCH)
 
     @patch.object(hooks, 'register_configs')
     @patch('charmhelpers.contrib.openstack.utils.config')
@@ -37,7 +37,8 @@
         openstack_upgrade.openstack_upgrade()
 
         self.assertTrue(self.do_openstack_upgrade.called)
-        self.assertTrue(self.config_changed.called)
+        self.os.execl.assert_called_with('./hooks/config-changed-postupgrade',
+                                         '')
 
     @patch.object(hooks, 'register_configs')
     @patch('charmhelpers.contrib.openstack.utils.config')
@@ -53,4 +54,4 @@
         openstack_upgrade.openstack_upgrade()
 
         self.assertFalse(self.do_openstack_upgrade.called)
-        self.assertFalse(self.config_changed.called)
+        self.assertFalse(self.os.execl.called)

=== modified file 'unit_tests/test_keystone_hooks.py'
--- unit_tests/test_keystone_hooks.py	2015-10-07 16:20:36 +0000
+++ unit_tests/test_keystone_hooks.py	2015-10-19 13:34:22 +0000
@@ -51,7 +51,7 @@
     # keystone_utils
     'restart_map',
     'register_configs',
-    'do_openstack_upgrade',
+    'do_openstack_upgrade_reexec',
     'openstack_upgrade_available',
     'save_script_rc',
     'migrate_database',
@@ -467,7 +467,7 @@
         ensure_user.assert_called_with(user=self.ssh_user, group='keystone')
         get_homedir.assert_called_with(self.ssh_user)
 
-        self.assertTrue(self.do_openstack_upgrade.called)
+        self.assertTrue(self.do_openstack_upgrade_reexec.called)
 
         self.save_script_rc.assert_called_with()
         configure_https.assert_called_with()
@@ -538,7 +538,7 @@
         hooks.config_changed()
         self.git_install.assert_called_with(projects_yaml)
         self.assertFalse(self.openstack_upgrade_available.called)
-        self.assertFalse(self.do_openstack_upgrade.called)
+        self.assertFalse(self.do_openstack_upgrade_reexec.called)
 
     @patch.object(hooks, 'git_install_requested')
     @patch.object(hooks, 'config_value_changed')
@@ -569,7 +569,7 @@
 
         hooks.config_changed()
 
-        self.assertFalse(self.do_openstack_upgrade.called)
+        self.assertFalse(self.do_openstack_upgrade_reexec.called)
 
     @patch('keystone_utils.log')
     @patch('keystone_utils.ensure_ssl_cert_master')