Skip to content

Commit 11089dd

Browse files
committed
Remove stale dispatchers options
Long time ago dispatcher* options were removed and deprecated in Ceilometer. Related-Prod: https://mirantis.jira.com/browse/PRODX-58788 Change-Id: I1f912ba62aabe4681337004259faaa653cff2fd7
1 parent 897c239 commit 11089dd

File tree

6 files changed

+0
-52
lines changed

6 files changed

+0
-52
lines changed

charts/openstack/ceilometer/templates/configmap-etc.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,6 @@ limitations under the License.
115115
{{- $_ := set .Values.conf.ceilometer.service_credentials "password" .Values.endpoints.identity.auth.ceilometer.password -}}
116116
{{- end -}}
117117

118-
{{- if empty .Values.conf.ceilometer.dispatcher_gnocchi.url -}}
119-
{{- $_ := tuple "metric" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ceilometer.dispatcher_gnocchi "url" -}}
120-
{{- end -}}
121-
122118
{{- if empty .Values.conf.ceilometer.api.aodh_url -}}
123119
{{- $_ := tuple "alarming" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ceilometer.api "aodh_url" -}}
124120
{{- end -}}

charts/openstack/ceilometer/values.yaml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -164,24 +164,8 @@ conf:
164164
ceilometer:
165165
DEFAULT:
166166
log_config_append: /etc/ceilometer/logging.conf
167-
event_dispatchers:
168-
type: multistring
169-
values:
170-
- database
171-
meter_dispatchers:
172-
type: multistring
173-
values:
174-
- database
175-
- gnocchi
176167
api:
177168
aodh_is_enabled: "False"
178-
# NOTE(portdirect): the following option will turn off the ability to retrieve
179-
# metrics via the ceilometer API:
180-
# gnocchi_is_enabled: "True"
181-
dispatcher_gnocchi:
182-
filter_service_activity: False
183-
archive_policy: low
184-
resources_definition_file: /etc/ceilometer/gnocchi_resources.yaml
185169
database:
186170
max_retries: -1
187171
dispatcher:

rockoon/templates/services/metering.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,6 @@ spec:
4646
ceilometer:
4747
DEFAULT:
4848
debug: false
49-
event_dispatchers:
50-
type: multistring
51-
values:
52-
- gnocchi
53-
meter_dispatchers:
54-
type: multistring
55-
values:
56-
- gnocchi
5749
coordination:
5850
{%- if OSVer.antelope <= OSVer[spec.openstack_version] < OSVer.master %}
5951
backend_url: {{ get_etcd3_endpoint(spec.openstack_version, 'etcd3gw') }}

tests/fixtures/render_service_template/output/metering/caracal_ceph_local_non_dvr_telemetry.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -679,14 +679,6 @@ spec:
679679
ceilometer:
680680
DEFAULT:
681681
debug: false
682-
event_dispatchers:
683-
type: multistring
684-
values:
685-
- gnocchi
686-
meter_dispatchers:
687-
type: multistring
688-
values:
689-
- gnocchi
690682
coordination:
691683
backend_url: etcd3+http://etcd:2379?api_version=auto
692684
api:

tests/fixtures/render_service_template/output/metering/ussuri_ceph_local_non_dvr_telemetry.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -680,14 +680,6 @@ spec:
680680
ceilometer:
681681
DEFAULT:
682682
debug: false
683-
event_dispatchers:
684-
type: multistring
685-
values:
686-
- gnocchi
687-
meter_dispatchers:
688-
type: multistring
689-
values:
690-
- gnocchi
691683
coordination:
692684
backend_url: etcd3://etcd:2379
693685
api:

tests/fixtures/render_service_template/output/metering/yoga_ceph_local_non_dvr_telemetry.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -679,14 +679,6 @@ spec:
679679
ceilometer:
680680
DEFAULT:
681681
debug: false
682-
event_dispatchers:
683-
type: multistring
684-
values:
685-
- gnocchi
686-
meter_dispatchers:
687-
type: multistring
688-
values:
689-
- gnocchi
690682
coordination:
691683
backend_url: etcd3://etcd:2379
692684
api:

0 commit comments

Comments
 (0)