Skip to content

Commit f845b22

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Remove ceilometer in favor of plugin"
2 parents 983c07c + e9a4750 commit f845b22

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
@@ -1072,10 +1072,6 @@ function get_packages {
10721072
if [[ ! $file_to_parse =~ $package_dir/cinder ]]; then
10731073
file_to_parse="${file_to_parse} ${package_dir}/cinder"
10741074
fi
1075-
elif [[ $service == ceilometer-* ]]; then
1076-
if [[ ! $file_to_parse =~ $package_dir/ceilometer ]]; then
1077-
file_to_parse="${file_to_parse} ${package_dir}/ceilometer"
1078-
fi
10791075
elif [[ $service == s-* ]]; then
10801076
if [[ ! $file_to_parse =~ $package_dir/swift ]]; then
10811077
file_to_parse="${file_to_parse} ${package_dir}/swift"
@@ -1816,7 +1812,6 @@ function enable_service {
18161812
# There are special cases for some 'catch-all' services::
18171813
# **nova** returns true if any service enabled start with **n-**
18181814
# **cinder** returns true if any service enabled start with **c-**
1819-
# **ceilometer** returns true if any service enabled start with **ceilometer**
18201815
# **glance** returns true if any service enabled start with **g-**
18211816
# **neutron** returns true if any service enabled start with **q-**
18221817
# **swift** returns true if any service enabled start with **s-**
@@ -1851,7 +1846,6 @@ function is_service_enabled {
18511846
[[ ${service} == n-cell-* && ${ENABLED_SERVICES} =~ "n-cell" ]] && enabled=0
18521847
[[ ${service} == n-cpu-* && ${ENABLED_SERVICES} =~ "n-cpu" ]] && enabled=0
18531848
[[ ${service} == "nova" && ${ENABLED_SERVICES} =~ "n-" ]] && enabled=0
1854-
[[ ${service} == "ceilometer" && ${ENABLED_SERVICES} =~ "ceilometer-" ]] && enabled=0
18551849
[[ ${service} == "glance" && ${ENABLED_SERVICES} =~ "g-" ]] && enabled=0
18561850
[[ ${service} == "ironic" && ${ENABLED_SERVICES} =~ "ir-" ]] && enabled=0
18571851
[[ ${service} == "neutron" && ${ENABLED_SERVICES} =~ "q-" ]] && enabled=0

0 commit comments

Comments
 (0)