Merge "Fix manager.py launch python version to match installed payload"

actions/openstack_upgrade.py

@@ -53,7 +53,8 @@ def openstack_upgrade():
     if (do_action_openstack_upgrade('keystone',
                                     do_openstack_upgrade,
                                     register_configs())):
-        os.execl('./hooks/config-changed-postupgrade', '')
+        os.execl('./hooks/config-changed-postupgrade',
+                 'config-changed-postupgrade')
 
 if __name__ == '__main__':
     openstack_upgrade()

hooks/keystone_utils.py

@@ -1117,9 +1117,7 @@ class ManagerServer():
     def _launch_manager(self):
         script = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                               'manager.py'))
-        release = CompareOpenStackReleases(
-            get_os_codename_install_source(config('openstack-origin'))
-        )
+        release = CompareOpenStackReleases(os_release('keystone'))
         # need to set the environment variable PYTHONPATH to include the
         # payload's directory for the manager.py to find the various keystone
         # clients

unit_tests/test_actions_openstack_upgrade.py

@@ -56,7 +56,7 @@ class TestKeystoneUpgradeActions(CharmTestCase):
 
         self.assertTrue(self.do_openstack_upgrade.called)
         self.os.execl.assert_called_with('./hooks/config-changed-postupgrade',
-                                         '')
+                                         'config-changed-postupgrade')
 
     @patch.object(openstack_upgrade, 'register_configs')
     @patch('charmhelpers.contrib.openstack.utils.config')