From 4faa7f927149a5c4ef7a03523f7bc14523cb9baa Mon Sep 17 00:00:00 2001 From: Stuart Mackie Date: Fri, 7 Oct 2016 12:24:58 -0700 Subject: Charms for Contrail 3.1 with Mitaka Change-Id: Id37f3b9743d1974e31fcd7cd9c54be41bb0c47fb Signed-off-by: Stuart Mackie --- charms/trusty/ceilometer/actions/actions.py | 48 ++++++++++++++++++++++ .../ceilometer/actions/ceilometer_contexts.py | 1 + .../trusty/ceilometer/actions/ceilometer_hooks.py | 1 + .../trusty/ceilometer/actions/ceilometer_utils.py | 1 + charms/trusty/ceilometer/actions/charmhelpers | 1 + charms/trusty/ceilometer/actions/openstack-upgrade | 1 + .../trusty/ceilometer/actions/openstack_upgrade.py | 37 +++++++++++++++++ charms/trusty/ceilometer/actions/pause | 1 + charms/trusty/ceilometer/actions/resume | 1 + 9 files changed, 92 insertions(+) create mode 100755 charms/trusty/ceilometer/actions/actions.py create mode 120000 charms/trusty/ceilometer/actions/ceilometer_contexts.py create mode 120000 charms/trusty/ceilometer/actions/ceilometer_hooks.py create mode 120000 charms/trusty/ceilometer/actions/ceilometer_utils.py create mode 120000 charms/trusty/ceilometer/actions/charmhelpers create mode 120000 charms/trusty/ceilometer/actions/openstack-upgrade create mode 100755 charms/trusty/ceilometer/actions/openstack_upgrade.py create mode 120000 charms/trusty/ceilometer/actions/pause create mode 120000 charms/trusty/ceilometer/actions/resume (limited to 'charms/trusty/ceilometer/actions') diff --git a/charms/trusty/ceilometer/actions/actions.py b/charms/trusty/ceilometer/actions/actions.py new file mode 100755 index 0000000..0c077b6 --- /dev/null +++ b/charms/trusty/ceilometer/actions/actions.py @@ -0,0 +1,48 @@ +#!/usr/bin/python + +import os +import sys + +from charmhelpers.core.hookenv import action_fail +from ceilometer_utils import ( + pause_unit_helper, + resume_unit_helper, + register_configs, +) + + +def pause(args): + """Pause the Ceilometer services. + + @raises Exception should the service fail to stop. + """ + pause_unit_helper(register_configs()) + + +def resume(args): + """Resume the Ceilometer services. + + @raises Exception should the service fail to start.""" + resume_unit_helper(register_configs()) + + +# A dictionary of all the defined actions to callables (which take +# parsed arguments). +ACTIONS = {"pause": pause, "resume": resume} + + +def main(args): + action_name = os.path.basename(args[0]) + try: + action = ACTIONS[action_name] + except KeyError: + return "Action %s undefined" % action_name + else: + try: + action(args) + except Exception as e: + action_fail(str(e)) + + +if __name__ == "__main__": + sys.exit(main(sys.argv)) diff --git a/charms/trusty/ceilometer/actions/ceilometer_contexts.py b/charms/trusty/ceilometer/actions/ceilometer_contexts.py new file mode 120000 index 0000000..6c03421 --- /dev/null +++ b/charms/trusty/ceilometer/actions/ceilometer_contexts.py @@ -0,0 +1 @@ +../lib/ceilometer_contexts.py \ No newline at end of file diff --git a/charms/trusty/ceilometer/actions/ceilometer_hooks.py b/charms/trusty/ceilometer/actions/ceilometer_hooks.py new file mode 120000 index 0000000..b55df6c --- /dev/null +++ b/charms/trusty/ceilometer/actions/ceilometer_hooks.py @@ -0,0 +1 @@ +../hooks/ceilometer_hooks.py \ No newline at end of file diff --git a/charms/trusty/ceilometer/actions/ceilometer_utils.py b/charms/trusty/ceilometer/actions/ceilometer_utils.py new file mode 120000 index 0000000..e333253 --- /dev/null +++ b/charms/trusty/ceilometer/actions/ceilometer_utils.py @@ -0,0 +1 @@ +../lib/ceilometer_utils.py \ No newline at end of file diff --git a/charms/trusty/ceilometer/actions/charmhelpers b/charms/trusty/ceilometer/actions/charmhelpers new file mode 120000 index 0000000..702de73 --- /dev/null +++ b/charms/trusty/ceilometer/actions/charmhelpers @@ -0,0 +1 @@ +../charmhelpers \ No newline at end of file diff --git a/charms/trusty/ceilometer/actions/openstack-upgrade b/charms/trusty/ceilometer/actions/openstack-upgrade new file mode 120000 index 0000000..6179301 --- /dev/null +++ b/charms/trusty/ceilometer/actions/openstack-upgrade @@ -0,0 +1 @@ +openstack_upgrade.py \ No newline at end of file diff --git a/charms/trusty/ceilometer/actions/openstack_upgrade.py b/charms/trusty/ceilometer/actions/openstack_upgrade.py new file mode 100755 index 0000000..cb04493 --- /dev/null +++ b/charms/trusty/ceilometer/actions/openstack_upgrade.py @@ -0,0 +1,37 @@ +#!/usr/bin/python +import sys + +sys.path.append('hooks/') + +from charmhelpers.contrib.openstack.utils import ( + do_action_openstack_upgrade, +) + +from ceilometer_hooks import ( + config_changed, + CONFIGS, +) + +from ceilometer_utils import ( + do_openstack_upgrade, +) + + +def openstack_upgrade(): + """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.""" + + if (do_action_openstack_upgrade('ceilometer-common', + do_openstack_upgrade, + CONFIGS)): + config_changed() + +if __name__ == '__main__': + openstack_upgrade() diff --git a/charms/trusty/ceilometer/actions/pause b/charms/trusty/ceilometer/actions/pause new file mode 120000 index 0000000..405a394 --- /dev/null +++ b/charms/trusty/ceilometer/actions/pause @@ -0,0 +1 @@ +actions.py \ No newline at end of file diff --git a/charms/trusty/ceilometer/actions/resume b/charms/trusty/ceilometer/actions/resume new file mode 120000 index 0000000..405a394 --- /dev/null +++ b/charms/trusty/ceilometer/actions/resume @@ -0,0 +1 @@ +actions.py \ No newline at end of file -- cgit 1.2.3-korg