diff options
| author | Julien Danjou <julien@danjou.info> | 2015-06-30 18:05:19 +0200 |
|---|---|---|
| committer | Julien Danjou <julien@danjou.info> | 2015-11-24 13:44:58 +0100 |
| commit | 6bc86f75ea881e5660413a9e2d67d91c1a16f8c7 (patch) | |
| tree | 9266ef8dc69a789e904979ff7a5bc15cabe28e69 /devstack/upgrade | |
| parent | 3549f782d11a1af1c32d8f9ebf86dcce1e81ac2b (diff) | |
| download | ceilometer-6bc86f75ea881e5660413a9e2d67d91c1a16f8c7.tar.gz | |
Remove alarming code
Since we moved all the alarming code and subsystem to the Aodh project,
remove it from Ceilometer.
Depends-On: I3983128d2d964b0f1f3326948b27f5d94df65a04
Depends-On: I99c9f2be0bbc70f289da5c2ba22698b8b7dc4495
Change-Id: Id169a914c1d1f2f5ad03ebb515d3d052204d5c5c
Diffstat (limited to 'devstack/upgrade')
| -rw-r--r-- | devstack/upgrade/settings | 4 | ||||
| -rwxr-xr-x | devstack/upgrade/shutdown.sh | 2 | ||||
| -rwxr-xr-x | devstack/upgrade/upgrade.sh | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings index 4a02b503..6a2dad94 100644 --- a/devstack/upgrade/settings +++ b/devstack/upgrade/settings @@ -1,7 +1,7 @@ register_project_for_upgrade ceilometer devstack_localrc base enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer -devstack_localrc base enable_service ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-collector ceilometer-api ceilometer-alarm-notifier ceilometer-alarm-evaluator tempest +devstack_localrc base enable_service ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-collector ceilometer-api tempest devstack_localrc target enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer -devstack_localrc target enable_service ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-collector ceilometer-api ceilometer-alarm-notifier ceilometer-alarm-evaluator tempest +devstack_localrc target enable_service ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-collector ceilometer-api tempest diff --git a/devstack/upgrade/shutdown.sh b/devstack/upgrade/shutdown.sh index 391e1389..ec0e692b 100755 --- a/devstack/upgrade/shutdown.sh +++ b/devstack/upgrade/shutdown.sh @@ -22,6 +22,6 @@ stop_ceilometer # ensure everything is stopped -SERVICES_DOWN="ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-collector ceilometer-api ceilometer-alarm-notifier ceilometer-alarm-evaluator" +SERVICES_DOWN="ceilometer-acompute ceilometer-acentral ceilometer-aipmi ceilometer-anotification ceilometer-collector ceilometer-api" ensure_services_stopped $SERVICES_DOWN diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh index 78f17031..1d7b56dc 100755 --- a/devstack/upgrade/upgrade.sh +++ b/devstack/upgrade/upgrade.sh @@ -78,8 +78,6 @@ ensure_services_started "ceilometer-polling --polling-namespaces compute" \ "ceilometer-polling --polling-namespaces central" \ "ceilometer-polling --polling-namespaces ipmi" \ ceilometer-agent-notification \ - ceilometer-alarm-evaluator \ - ceilometer-alarm-notifier \ ceilometer-api \ ceilometer-collector |