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

[David Ames]

Add action managed upgrades of OpenStack

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

charm_lint_check #9942 openstack-dashboard-next for thedac mp271027
    LINT OK: passed

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

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

charm_unit_test #9160 openstack-dashboard-next for thedac mp271027
    UNIT OK: passed

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

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

charm_amulet_test #6425 openstack-dashboard-next for thedac mp271027
    AMULET FAIL: amulet-test failed

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

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

[lp:~thedac/charms/trusty/openstack-dashboard/action-managed-upgrade]

86. By David Ames on 2015-09-15

Add tests for action managed upgrade

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

charm_lint_check #10062 openstack-dashboard-next for thedac mp271027
    LINT OK: passed

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

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

charm_unit_test #9229 openstack-dashboard-next for thedac mp271027
    UNIT OK: passed

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

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

charm_amulet_test #6448 openstack-dashboard-next for thedac mp271027
    AMULET OK: passed

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

[Corey Bryant (corey.bryant)]

Hey David, inline comment below.

[Corey Bryant (corey.bryant)]

Response to my initial comment inline.h

[Corey Bryant (corey.bryant)]

Bad wifi, added comment inline again

[lp:~thedac/charms/trusty/openstack-dashboard/action-managed-upgrade]

87. By David Ames on 2015-09-21

Specifically call config_changed which has the restart_on_change decorator

88. By David Ames on 2015-09-21

Fix tests

[David Ames (thedac)]

Agreed. Calling config_changed() on successful upgrade.

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

charm_unit_test #9613 openstack-dashboard-next for thedac mp271027
    UNIT OK: passed

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

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

charm_lint_check #10424 openstack-dashboard-next for thedac mp271027
    LINT OK: passed

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

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

charm_amulet_test #6569 openstack-dashboard-next for thedac mp271027
    AMULET OK: passed

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

[Billy Olsen (billy-olsen)]

David, added an inline comment below. Minor fix and it should be good to go.

review: Needs Fixing

[lp:~thedac/charms/trusty/openstack-dashboard/action-managed-upgrade]

89. By David Ames on 2015-09-23

Do not use register_configs import CONFIGS directly

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

charm_lint_check #10574 openstack-dashboard-next for thedac mp271027
    LINT OK: passed

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

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

charm_unit_test #9761 openstack-dashboard-next for thedac mp271027
    UNIT OK: passed

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

[David Ames (thedac)]

Resubmit

review: Needs Resubmitting

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

charm_amulet_test #6706 openstack-dashboard-next for thedac mp271027
    AMULET OK: passed

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

=== modified file 'actions.yaml'
--- actions.yaml	2015-04-07 13:58:41 +0000
+++ actions.yaml	2015-09-23 14:38:13 +0000
@@ -1,2 +1,4 @@
 git-reinstall:
   description: Reinstall openstack-dashboard 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 14:38:13 +0000
@@ -0,0 +1,34 @@
+#!/usr/bin/python
+import sys
+
+sys.path.append('hooks/')
+
+from charmhelpers.contrib.openstack.utils import (
+    do_action_openstack_upgrade,
+)
+
+from horizon_utils import (
+    do_openstack_upgrade,
+)
+
+from horizon_hooks import (
+    config_changed,
+    CONFIGS,
+)
+
+
+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('openstack-dashboard',
+                                   do_openstack_upgrade,
+                                   CONFIGS):
+        config_changed()
+
+if __name__ == '__main__':
+    openstack_upgrade()

=== modified file 'config.yaml'
--- config.yaml	2015-07-10 14:18:48 +0000
+++ config.yaml	2015-09-23 14:38:13 +0000
@@ -175,4 +175,13 @@
     description: |
       A comma-separated list of nagios servicegroups. If left empty, the
       nagios_context will be used as the servicegroup.
-
+  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-04 13:59:26 +0000
+++ hooks/charmhelpers/contrib/openstack/utils.py	2015-09-23 14:38:13 +0000
@@ -25,6 +25,7 @@
 import re
 
 import six
+import traceback
 import yaml
 
 from charmhelpers.contrib.network import ip
@@ -34,6 +35,8 @@
 )
 
 from charmhelpers.core.hookenv import (
+    action_fail,
+    action_set,
     config,
     log as juju_log,
     charm_dir,
@@ -114,6 +117,7 @@
     ('2.2.1', 'kilo'),
     ('2.2.2', 'kilo'),
     ('2.3.0', 'liberty'),
+    ('2.4.0', 'liberty'),
 ])
 
 # >= Liberty version->codename mapping
@@ -748,3 +752,47 @@
         return projects[key]
 
     return None
+
+
+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

=== modified file 'hooks/horizon_hooks.py'
--- hooks/horizon_hooks.py	2015-09-23 08:07:40 +0000
+++ hooks/horizon_hooks.py	2015-09-23 14:38:13 +0000
@@ -104,7 +104,7 @@
     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('openstack-dashboard'):
             do_openstack_upgrade(configs=CONFIGS)
 

=== 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 14:38:13 +0000
@@ -0,0 +1,53 @@
+from mock import patch
+import os
+
+os.environ['JUJU_UNIT_NAME'] = 'openstack-dashboard'
+
+with patch('horizon_utils.register_configs') as register_configs:
+    import openstack_upgrade
+
+from test_utils import (
+    CharmTestCase
+)
+
+TO_PATCH = [
+    'do_openstack_upgrade',
+    'config_changed',
+]
+
+
+class TestHorizonUpgradeActions(CharmTestCase):
+
+    def setUp(self):
+        super(TestHorizonUpgradeActions, 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
+
+        openstack_upgrade.openstack_upgrade()
+
+        self.assertTrue(self.do_openstack_upgrade.called)
+        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)