Skip to content

Commit e9a4750

Browse files
author
Chris Dent
committed
Remove ceilometer in favor of plugin
The ceilometer project is moving to using a devstack plugin rather than having ceilometer in the base devstack. This is to allow greater control and flexibility. Change-Id: I413ab159474b7d7231ad66d3a482201f74efe8a8
1 parent 633e740 commit e9a4750

9 files changed

Lines changed: 4 additions & 475 deletions

File tree

‎clean.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ source $TOP_DIR/lib/glance
4848
source $TOP_DIR/lib/nova
4949
source $TOP_DIR/lib/cinder
5050
source $TOP_DIR/lib/swift
51-
source $TOP_DIR/lib/ceilometer
5251
source $TOP_DIR/lib/heat
5352
source $TOP_DIR/lib/neutron-legacy
5453
source $TOP_DIR/lib/ironic

‎doc/source/index.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ Scripts
154154
* `functions <functions.html>`__ - DevStack-specific functions
155155
* `functions-common <functions-common.html>`__ - Functions shared with other projects
156156
* `lib/apache <lib/apache.html>`__
157-
* `lib/ceilometer <lib/ceilometer.html>`__
158157
* `lib/ceph <lib/ceph.html>`__
159158
* `lib/cinder <lib/cinder.html>`__
160159
* `lib/database <lib/database.html>`__

‎files/apache-ceilometer.template‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎functions-common‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,10 +1033,6 @@ function get_packages {
10331033
if [[ ! $file_to_parse =~ $package_dir/cinder ]]; then
10341034
file_to_parse="${file_to_parse} ${package_dir}/cinder"
10351035
fi
1036-
elif [[ $service == ceilometer-* ]]; then
1037-
if [[ ! $file_to_parse =~ $package_dir/ceilometer ]]; then
1038-
file_to_parse="${file_to_parse} ${package_dir}/ceilometer"
1039-
fi
10401036
elif [[ $service == s-* ]]; then
10411037
if [[ ! $file_to_parse =~ $package_dir/swift ]]; then
10421038
file_to_parse="${file_to_parse} ${package_dir}/swift"
@@ -1777,7 +1773,6 @@ function enable_service {
17771773
# There are special cases for some 'catch-all' services::
17781774
# **nova** returns true if any service enabled start with **n-**
17791775
# **cinder** returns true if any service enabled start with **c-**
1780-
# **ceilometer** returns true if any service enabled start with **ceilometer**
17811776
# **glance** returns true if any service enabled start with **g-**
17821777
# **neutron** returns true if any service enabled start with **q-**
17831778
# **swift** returns true if any service enabled start with **s-**
@@ -1813,7 +1808,6 @@ function is_service_enabled {
18131808
[[ ${service} == n-cell-* && ${ENABLED_SERVICES} =~ "n-cell" ]] && enabled=0
18141809
[[ ${service} == n-cpu-* && ${ENABLED_SERVICES} =~ "n-cpu" ]] && enabled=0
18151810
[[ ${service} == "nova" && ${ENABLED_SERVICES} =~ "n-" ]] && enabled=0
1816-
[[ ${service} == "ceilometer" && ${ENABLED_SERVICES} =~ "ceilometer-" ]] && enabled=0
18171811
[[ ${service} == "glance" && ${ENABLED_SERVICES} =~ "g-" ]] && enabled=0
18181812
[[ ${service} == "ironic" && ${ENABLED_SERVICES} =~ "ir-" ]] && enabled=0
18191813
[[ ${service} == "neutron" && ${ENABLED_SERVICES} =~ "q-" ]] && enabled=0

0 commit comments

Comments
 (0)