Merge lp:~thedac/charms/trusty/nova-cloud-controller/action-managed-upgrade into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[David Ames]

Action managed upgrade

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

charm_unit_test #9614 nova-cloud-controller-next for thedac mp271893
    UNIT OK: passed

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

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

charm_lint_check #10426 nova-cloud-controller-next for thedac mp271893
    LINT OK: passed

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

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

charm_amulet_test #6568 nova-cloud-controller-next for thedac mp271893
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/12519427/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6568/

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

charm_lint_check #10467 nova-cloud-controller-next for thedac mp271893
    LINT OK: passed

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

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

charm_unit_test #9658 nova-cloud-controller-next for thedac mp271893
    UNIT OK: passed

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

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

charm_amulet_test #6610 nova-cloud-controller-next for thedac mp271893
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/12526974/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6610/

[lp:~thedac/charms/trusty/nova-cloud-controller/action-managed-upgrade]

189. By David Ames on 2015-09-23

Do not use register_configs import CONFIGS directly

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

charm_lint_check #10576 nova-cloud-controller-next for thedac mp271893
    LINT OK: passed

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

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

charm_unit_test #9764 nova-cloud-controller-next for thedac mp271893
    UNIT OK: passed

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

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

charm_amulet_test #6710 nova-cloud-controller-next for thedac mp271893
    AMULET FAIL: amulet-test failed

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

Full amulet test output: http://paste.ubuntu.com/12537992/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6710/

=== modified file 'actions.yaml'
--- actions.yaml	2015-04-15 14:17:56 +0000
+++ actions.yaml	2015-09-23 16:09:47 +0000
@@ -1,2 +1,4 @@
 git-reinstall:
     description: Reinstall nova-cloud-controller from the openstack-origin-git repositories.
+openstack-upgrade:
+    description: Perform openstack upgrades. Config option action-managed-upgrade must be set to True.

=== added symlink 'actions/openstack-upgrade'
=== target is u'openstack_upgrade.py'
=== added file 'actions/openstack_upgrade.py'
--- actions/openstack_upgrade.py	1970-01-01 00:00:00 +0000
+++ actions/openstack_upgrade.py	2015-09-23 16:09:47 +0000
@@ -0,0 +1,41 @@
+#!/usr/bin/python
+import sys
+
+sys.path.append('hooks/')
+
+from charmhelpers.contrib.openstack.utils import (
+    do_action_openstack_upgrade,
+)
+
+from charmhelpers.core.hookenv import (
+    relation_ids,
+)
+
+from nova_cc_utils import (
+    do_openstack_upgrade,
+)
+
+from nova_cc_hooks import (
+    config_changed,
+    CONFIGS,
+    neutron_api_relation_joined,
+)
+
+
+def openstack_upgrade():
+    """Upgrade packages to config-set Openstack version.
+
+    If the charm was installed from source we cannot upgrade it.
+    For backwards compatibility a config flag must be set for this
+    code to run, otherwise a full service level upgrade will fire
+    on config-changed."""
+
+    if (do_action_openstack_upgrade('nova-common',
+                                    do_openstack_upgrade,
+                                    CONFIGS)):
+        [neutron_api_relation_joined(rid=rid, remote_restart=True)
+            for rid in relation_ids('neutron-api')]
+        config_changed()
+
+if __name__ == '__main__':
+    openstack_upgrade()

=== modified file 'config.yaml'
--- config.yaml	2015-09-21 18:06:09 +0000
+++ config.yaml	2015-09-23 16:09:47 +0000
@@ -395,3 +395,13 @@
       
       If memcached is being used to store the tokens, then it's recommended to
       change this configuration to False.
+  action-managed-upgrade:
+    type: boolean
+    default: False
+    description: |
+      If True enables openstack upgrades for this charm via juju actions.
+      You will still need to set openstack-origin to the new repository but
+      instead of an upgrade running automatically across all units, it will
+      wait for you to execute the openstack-upgrade action for this charm on
+      each unit. If False it will revert to existing behavior of upgrading
+      all units on config change.

=== modified file 'hooks/charmhelpers/contrib/openstack/utils.py'
--- hooks/charmhelpers/contrib/openstack/utils.py	2015-09-22 02:45:17 +0000
+++ hooks/charmhelpers/contrib/openstack/utils.py	2015-09-23 16:09:47 +0000
@@ -148,6 +148,9 @@
     'glance-common': OrderedDict([
         ('11.0.0', 'liberty'),
     ]),
+    'openstack-dashboard': OrderedDict([
+        ('8.0.0', 'liberty'),
+    ]),
 }
 
 DEFAULT_LOOPBACK_SIZE = '5G'
@@ -751,6 +754,7 @@
         return projects[key]
 
     return None
+<<<<<<< TREE
 
 
 def os_workload_status(configs, required_interfaces, charm_func=None):
@@ -965,3 +969,49 @@
             action_set({'outcome': 'no upgrade available.'})
 
     return ret
+=======
+
+
+def do_action_openstack_upgrade(package, upgrade_callback, configs):
+    """Perform action-managed OpenStack upgrade.
+
+    Upgrades packages to the configured openstack-origin version and sets
+    the corresponding action status as a result.
+
+    If the charm was installed from source we cannot upgrade it.
+    For backwards compatibility a config flag (action-managed-upgrade) must
+    be set for this code to run, otherwise a full service level upgrade will
+    fire on config-changed.
+
+    @param package: package name for determining if upgrade available
+    @param upgrade_callback: function callback to charm's upgrade function
+    @param configs: templating object derived from OSConfigRenderer class
+
+    @return: True if upgrade successful; False if upgrade failed or skipped
+    """
+    ret = False
+
+    if git_install_requested():
+        action_set({'outcome': 'installed from source, skipped upgrade.'})
+    else:
+        if openstack_upgrade_available(package):
+            if config('action-managed-upgrade'):
+                juju_log('Upgrading OpenStack release')
+
+                try:
+                    upgrade_callback(configs=configs)
+                    action_set({'outcome': 'success, upgrade completed.'})
+                    ret = True
+                except:
+                    action_set({'outcome': 'upgrade failed, see traceback.'})
+                    action_set({'traceback': traceback.format_exc()})
+                    action_fail('do_openstack_upgrade resulted in an '
+                                'unexpected error')
+            else:
+                action_set({'outcome': 'action-managed-upgrade config is '
+                                       'False, skipped upgrade.'})
+        else:
+            action_set({'outcome': 'no upgrade available.'})
+
+    return ret
+>>>>>>> MERGE-SOURCE

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2015-09-22 13:52:12 +0000
+++ hooks/nova_cc_hooks.py	2015-09-23 16:09:47 +0000
@@ -182,9 +182,9 @@
     if git_install_requested():
         if config_value_changed('openstack-origin-git'):
             git_install(config('openstack-origin-git'))
-    else:
+    elif not config('action-managed-upgrade'):
         if openstack_upgrade_available('nova-common'):
-            CONFIGS = do_openstack_upgrade()
+            CONFIGS = do_openstack_upgrade(CONFIGS)
             [neutron_api_relation_joined(rid=rid, remote_restart=True)
                 for rid in relation_ids('neutron-api')]
     save_script_rc()

=== modified file 'hooks/nova_cc_utils.py'
--- hooks/nova_cc_utils.py	2015-08-06 06:04:08 +0000
+++ hooks/nova_cc_utils.py	2015-09-23 16:09:47 +0000
@@ -624,7 +624,7 @@
     return configs
 
 
-def do_openstack_upgrade():
+def do_openstack_upgrade(configs):
     new_src = config('openstack-origin')
     if new_src[:6] != 'cloud:':
         raise ValueError("Unable to perform upgrade to %s" % new_src)

=== added file 'unit_tests/test_actions_openstack_upgrade.py'
--- unit_tests/test_actions_openstack_upgrade.py	1970-01-01 00:00:00 +0000
+++ unit_tests/test_actions_openstack_upgrade.py	2015-09-23 16:09:47 +0000
@@ -0,0 +1,76 @@
+from mock import patch, MagicMock
+import os
+
+os.environ['JUJU_UNIT_NAME'] = 'nova-cloud-controller'
+
+
+with patch('charmhelpers.core.hookenv.config') as config:
+    config.return_value = 'nova'
+    import nova_cc_utils as utils  # noqa
+
+_reg = utils.register_configs
+_map = utils.restart_map
+
+utils.register_configs = MagicMock()
+utils.restart_map = MagicMock()
+
+with patch('nova_cc_utils.guard_map') as gmap:
+    with patch('charmhelpers.core.hookenv.config') as config:
+        config.return_value = False
+        gmap.return_value = {}
+        import openstack_upgrade
+
+utils.register_configs = _reg
+utils.restart_map = _map
+
+from test_utils import (
+    CharmTestCase
+)
+
+TO_PATCH = [
+    'do_openstack_upgrade',
+    'relation_ids',
+    'neutron_api_relation_joined',
+    'config_changed',
+]
+
+
+class TestNovaCCUpgradeActions(CharmTestCase):
+
+    def setUp(self):
+        super(TestNovaCCUpgradeActions, self).setUp(openstack_upgrade,
+                                                    TO_PATCH)
+
+    @patch('charmhelpers.contrib.openstack.utils.config')
+    @patch('charmhelpers.contrib.openstack.utils.action_set')
+    @patch('charmhelpers.contrib.openstack.utils.git_install_requested')
+    @patch('charmhelpers.contrib.openstack.utils.openstack_upgrade_available')
+    def test_openstack_upgrade_true(self, upgrade_avail, git_requested,
+                                    action_set, config):
+        git_requested.return_value = False
+        upgrade_avail.return_value = True
+        config.return_value = True
+        self.relation_ids.return_value = ['relid1']
+
+        openstack_upgrade.openstack_upgrade()
+
+        self.assertTrue(self.do_openstack_upgrade.called)
+        self.assertTrue(
+            self.neutron_api_relation_joined.called_with(rid='relid1',
+                                                         remote_restart=True))
+        self.assertTrue(self.config_changed.called)
+
+    @patch('charmhelpers.contrib.openstack.utils.config')
+    @patch('charmhelpers.contrib.openstack.utils.action_set')
+    @patch('charmhelpers.contrib.openstack.utils.git_install_requested')
+    @patch('charmhelpers.contrib.openstack.utils.openstack_upgrade_available')
+    def test_openstack_upgrade_false(self, upgrade_avail, git_requested,
+                                     action_set, config):
+        git_requested.return_value = False
+        upgrade_avail.return_value = True
+        config.return_value = False
+
+        openstack_upgrade.openstack_upgrade()
+
+        self.assertFalse(self.do_openstack_upgrade.called)
+        self.assertFalse(self.config_changed.called)

=== modified file 'unit_tests/test_nova_cc_utils.py'
--- unit_tests/test_nova_cc_utils.py	2015-07-29 11:23:06 +0000
+++ unit_tests/test_nova_cc_utils.py	2015-09-23 16:09:47 +0000
@@ -647,7 +647,7 @@
             'icehouse']
         self.is_elected_leader.return_value = True
         self.relation_ids.return_value = []
-        utils.do_openstack_upgrade()
+        utils.do_openstack_upgrade(self.register_configs())
         expected = [call(['stamp', 'grizzly']), call(['upgrade', 'head']),
                     call(['stamp', 'havana']), call(['upgrade', 'head'])]
         self.assertEquals(self.neutron_db_manage.call_args_list, expected)
@@ -655,7 +655,7 @@
         self.apt_upgrade.assert_called_with(options=DPKG_OPTS, fatal=True,
                                             dist=True)
         self.apt_install.assert_called_with(determine_packages(), fatal=True)
-        expected = [call(release='havana'), call(release='icehouse')]
+        expected = [call(), call(release='havana'), call(release='icehouse')]
         self.assertEquals(self.register_configs.call_args_list, expected)
         self.assertEquals(self.ml2_migration.call_count, 1)
         self.assertTrue(migrate_nova_database.call_count, 2)
@@ -673,7 +673,7 @@
         self.get_os_codename_install_source.return_value = 'icehouse'
         self.is_elected_leader.return_value = True
         self.relation_ids.return_value = []
-        utils.do_openstack_upgrade()
+        utils.do_openstack_upgrade(self.register_configs())
         self.neutron_db_manage.assert_called_with(['upgrade', 'head'])
         self.apt_update.assert_called_with(fatal=True)
         self.apt_upgrade.assert_called_with(options=DPKG_OPTS, fatal=True,
@@ -696,7 +696,7 @@
         self.get_os_codename_install_source.return_value = 'juno'
         self.is_elected_leader.return_value = True
         self.relation_ids.return_value = []
-        utils.do_openstack_upgrade()
+        utils.do_openstack_upgrade(self.register_configs())
         neutron_db_calls = [call(['stamp', 'icehouse']),
                             call(['upgrade', 'head'])]
         self.neutron_db_manage.assert_has_calls(neutron_db_calls,
@@ -722,7 +722,7 @@
         self.get_os_codename_install_source.return_value = 'kilo'
         self.is_elected_leader.return_value = True
         self.relation_ids.return_value = []
-        utils.do_openstack_upgrade()
+        utils.do_openstack_upgrade(self.register_configs())
         self.assertEquals(self.neutron_db_manage.call_count, 0)
         self.apt_update.assert_called_with(fatal=True)
         self.apt_upgrade.assert_called_with(options=DPKG_OPTS, fatal=True,
@@ -741,7 +741,7 @@
             _file.read = MagicMock()
             _file.readline.return_value = ("deb url"
                                            " precise-updates/grizzly main")
-            utils.do_openstack_upgrade()
+            utils.do_openstack_upgrade(self.register_configs())
             expected = [call('cloud:precise-havana'),
                         call('cloud:precise-icehouse')]
             self.assertEquals(_do_openstack_upgrade.call_args_list, expected)
@@ -754,7 +754,7 @@
         with patch_open() as (_open, _file):
             _file.read = MagicMock()
             _file.readline.return_value = "deb url precise-updates/havana main"
-            utils.do_openstack_upgrade()
+            utils.do_openstack_upgrade(self.register_configs())
             expected = [call('cloud:precise-icehouse')]
             self.assertEquals(_do_openstack_upgrade.call_args_list, expected)