From 88df88a19674ccc0017836941b8ee32eaadf19fb Mon Sep 17 00:00:00 2001 From: Stuart Mackie Date: Thu, 23 Mar 2017 06:19:54 -0700 Subject: Deleted charms with wrong license. Will source them differently in future. Change-Id: I0fc99ea03c6b6ca4701e63793cb2be60e56c7588 Signed-off-by: Stuart Mackie --- charms/trusty/ceilometer-agent/actions/actions.py | 62 ---------------------- .../ceilometer-agent/actions/openstack-upgrade | 1 - .../ceilometer-agent/actions/openstack_upgrade.py | 52 ------------------ charms/trusty/ceilometer-agent/actions/pause | 1 - charms/trusty/ceilometer-agent/actions/resume | 1 - 5 files changed, 117 deletions(-) delete mode 100755 charms/trusty/ceilometer-agent/actions/actions.py delete mode 120000 charms/trusty/ceilometer-agent/actions/openstack-upgrade delete mode 100755 charms/trusty/ceilometer-agent/actions/openstack_upgrade.py delete mode 120000 charms/trusty/ceilometer-agent/actions/pause delete mode 120000 charms/trusty/ceilometer-agent/actions/resume (limited to 'charms/trusty/ceilometer-agent/actions') diff --git a/charms/trusty/ceilometer-agent/actions/actions.py b/charms/trusty/ceilometer-agent/actions/actions.py deleted file mode 100755 index ee6a76b..0000000 --- a/charms/trusty/ceilometer-agent/actions/actions.py +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/python -# -# Copyright 2016 Canonical Ltd -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import os -import sys - -sys.path.append('hooks/') - -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-agent/actions/openstack-upgrade b/charms/trusty/ceilometer-agent/actions/openstack-upgrade deleted file mode 120000 index 6179301..0000000 --- a/charms/trusty/ceilometer-agent/actions/openstack-upgrade +++ /dev/null @@ -1 +0,0 @@ -openstack_upgrade.py \ No newline at end of file diff --git a/charms/trusty/ceilometer-agent/actions/openstack_upgrade.py b/charms/trusty/ceilometer-agent/actions/openstack_upgrade.py deleted file mode 100755 index da6f160..0000000 --- a/charms/trusty/ceilometer-agent/actions/openstack_upgrade.py +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/python -# -# Copyright 2016 Canonical Ltd -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -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-agent/actions/pause b/charms/trusty/ceilometer-agent/actions/pause deleted file mode 120000 index 405a394..0000000 --- a/charms/trusty/ceilometer-agent/actions/pause +++ /dev/null @@ -1 +0,0 @@ -actions.py \ No newline at end of file diff --git a/charms/trusty/ceilometer-agent/actions/resume b/charms/trusty/ceilometer-agent/actions/resume deleted file mode 120000 index 405a394..0000000 --- a/charms/trusty/ceilometer-agent/actions/resume +++ /dev/null @@ -1 +0,0 @@ -actions.py \ No newline at end of file -- cgit 1.2.3-korg