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

[David Ames]

Action managed upgrades

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

charm_lint_check #10473 swift-storage-next for thedac mp272046
    LINT OK: passed

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

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

charm_unit_test #9664 swift-storage-next for thedac mp272046
    UNIT OK: passed

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

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

charm_amulet_test #6616 swift-storage-next for thedac mp272046
    AMULET OK: passed

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

=== modified file 'actions.yaml'
--- actions.yaml	2015-08-11 09:55:31 +0000
+++ actions.yaml	2015-09-22 23:01:36 +0000
@@ -2,4 +2,5 @@
   description: Pause the swift-storage unit. This action will stop Swift services.
 resume:
   description: Resume the swift-storage unit. This action will start Swift services.
-
+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-22 23:01:36 +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 swift_storage_hooks import (
+    config_changed,
+    CONFIGS,
+)
+
+from lib.swift_storage_utils import (
+    do_openstack_upgrade,
+)
+
+
+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('swift',
+                                    do_openstack_upgrade,
+                                    CONFIGS)):
+        config_changed()
+
+if __name__ == '__main__':
+    openstack_upgrade()

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2015-09-14 11:43:35 +0000
+++ charmhelpers/contrib/openstack/utils.py	2015-09-22 23:01:36 +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,
@@ -749,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 'config.yaml'
--- config.yaml	2015-07-10 14:13:35 +0000
+++ config.yaml	2015-09-22 23:01:36 +0000
@@ -125,3 +125,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/swift_storage_hooks.py'
--- hooks/swift_storage_hooks.py	2015-08-28 10:21:17 +0000
+++ hooks/swift_storage_hooks.py	2015-09-22 23:01:36 +0000
@@ -73,7 +73,8 @@
     ensure_swift_directories()
     setup_rsync()
 
-    if openstack_upgrade_available('swift'):
+    if not config('action-managed-upgrade') and \
+            openstack_upgrade_available('swift'):
         do_openstack_upgrade(configs=CONFIGS)
     CONFIGS.write_all()
 

=== 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-22 23:01:36 +0000
@@ -0,0 +1,58 @@
+from mock import patch
+import os
+
+os.environ['JUJU_UNIT_NAME'] = 'swift-storge'
+
+with patch('charmhelpers.core.hookenv.config') as config:
+    config.return_value = 'swift-storage'
+    import actions.openstack_upgrade as openstack_upgrade
+
+from test_utils import (
+    CharmTestCase
+)
+
+TO_PATCH = [
+    'config_changed',
+    'do_openstack_upgrade',
+]
+
+
+class TestSwiftStorageUpgradeActions(CharmTestCase):
+
+    def setUp(self):
+        super(TestSwiftStorageUpgradeActions, self).setUp(openstack_upgrade,
+                                                          TO_PATCH)
+
+    @patch('actions.charmhelpers.contrib.openstack.utils.config')
+    @patch('actions.charmhelpers.contrib.openstack.utils.action_set')
+    @patch('actions.charmhelpers.contrib.openstack.utils.'
+           'git_install_requested')
+    @patch('actions.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('actions.charmhelpers.contrib.openstack.utils.config')
+    @patch('actions.charmhelpers.contrib.openstack.utils.action_set')
+    @patch('actions.charmhelpers.contrib.openstack.utils.'
+           'git_install_requested')
+    @patch('actions.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)