diff --git a/ceilometer/templates/bin/_ceilometer-api.sh.tpl b/ceilometer/templates/bin/_ceilometer-api.sh.tpl
deleted file mode 100644
index 3ba90d998c..0000000000
--- a/ceilometer/templates/bin/_ceilometer-api.sh.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-{{/*
-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.
-*/}}
-
-set -ex
-COMMAND="${@:-start}"
-
-function start () {
- {{- if .Values.conf.software.apache2.a2enmod }}
- {{- range .Values.conf.software.apache2.a2enmod }}
- a2enmod {{ . }}
- {{- end }}
- {{- end }}
-
- {{- if .Values.conf.software.apache2.a2dismod }}
- {{- range .Values.conf.software.apache2.a2dismod }}
- a2dismod {{ . }}
- {{- end }}
- {{- end }}
-
- if [ -f /etc/apache2/envvars ]; then
- # Loading Apache2 ENV variables
- source /etc/apache2/envvars
- # The directory below has to be created due to the fact that
- # libapache2-mod-wsgi-py3 doesn't create it in contrary by libapache2-mod-wsgi
- if [ ! -d ${APACHE_RUN_DIR} ]; then
- mkdir -p ${APACHE_RUN_DIR}
- fi
- fi
-
- # Start Apache2
- exec {{ .Values.conf.software.apache2.binary }} {{ .Values.conf.software.apache2.start_parameters }}
-}
-
-function stop () {
- {{ .Values.conf.software.apache2.binary }} -k graceful-stop
-}
-
-$COMMAND
diff --git a/ceilometer/templates/bin/_db-init-mongodb.sh.tpl b/ceilometer/templates/bin/_db-init-mongodb.sh.tpl
deleted file mode 100644
index 719e79b53a..0000000000
--- a/ceilometer/templates/bin/_db-init-mongodb.sh.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-{{/*
-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.
-*/}}
-
-set -ex
-
-MONGO_URL=$(echo $ROOT_DB_CONNECTION | awk -F '@' '{ print $NF }' | awk -F '/' '{ print $1 }')
-MONGO_HOST=$(echo $MONGO_URL | awk -F ':' '{ print $1 }')
-MONGO_PORT=$(echo $MONGO_URL | awk -F ':' '{ print $2 }')
-
-MONGO_ADMIN_CREDS=$(echo $ROOT_DB_CONNECTION | awk -F '@' '{ print $1 }')
-MONGO_ADMIN_USER=$(echo ${MONGO_ADMIN_CREDS#mongodb://} | awk -F ':' '{ print $1 }')
-MONGO_ADMIN_PASS=$(echo ${MONGO_ADMIN_CREDS#mongodb://} | awk -F ':' '{ print $NF }')
-
-MONGO_USER_CREDS=$(echo $USER_DB_CONNECTION | awk -F '@' '{ print $1 }')
-MONGO_USER_USER=$(echo ${MONGO_USER_CREDS#mongodb://} | awk -F ':' '{ print $1 }')
-MONGO_USER_PASS=$(echo ${MONGO_USER_CREDS#mongodb://} | awk -F ':' '{ print $NF }')
-MONGO_USER_DB=$(echo $USER_DB_CONNECTION | awk -F '/' '{ print $NF }')
-
-mongo admin \
- --host "${MONGO_HOST}" \
- --port "${MONGO_PORT}" \
- --username "${MONGO_ADMIN_USER}" \
- --password "${MONGO_ADMIN_PASS}" \
- --eval "db = db.getSiblingDB(\"${MONGO_USER_DB}\"); \
- db.changeUserPassword(\"${MONGO_USER_USER}\", \"${MONGO_USER_PASS}\")" || \
- mongo admin \
- --host "${MONGO_HOST}" \
- --port "${MONGO_PORT}" \
- --username "${MONGO_ADMIN_USER}" \
- --password "${MONGO_ADMIN_PASS}" \
- --eval "db = db.getSiblingDB(\"${MONGO_USER_DB}\");
- db.createUser({user: \"${MONGO_USER_USER}\",
- pwd: \"${MONGO_USER_PASS}\",
- roles: [ \"readWrite\", \"dbAdmin\" ]})"
diff --git a/ceilometer/templates/configmap-bin.yaml b/ceilometer/templates/configmap-bin.yaml
index 753249780c..0e8bbe2bfd 100644
--- a/ceilometer/templates/configmap-bin.yaml
+++ b/ceilometer/templates/configmap-bin.yaml
@@ -14,7 +14,6 @@ limitations under the License.
{{- if .Values.manifests.configmap_bin }}
{{- $envAll := . }}
-{{- $rallyTests := .Values.conf.rally_tests }}
---
apiVersion: v1
kind: ConfigMap
@@ -29,22 +28,10 @@ data:
bootstrap.sh: |
{{ tuple "bin/_bootstrap.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}
- rally-test.sh: |
-{{ tuple $rallyTests | include "helm-toolkit.scripts.rally_test" | indent 4 }}
- db-init-mongodb.sh: |
-{{ tuple "bin/_db-init-mongodb.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
- db-init.py: |
-{{- include "helm-toolkit.scripts.db_init" . | indent 4 }}
db-sync.sh: |
{{ tuple "bin/_db-sync.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
- ks-service.sh: |
-{{- include "helm-toolkit.scripts.keystone_service" . | indent 4 }}
- ks-endpoints.sh: |
-{{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }}
ks-user.sh: |
{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }}
- ceilometer-api.sh: |
-{{ tuple "bin/_ceilometer-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
ceilometer-central.sh: |
{{ tuple "bin/_ceilometer-central.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
ceilometer-compute.sh: |
diff --git a/ceilometer/templates/configmap-etc.yaml b/ceilometer/templates/configmap-etc.yaml
index 564030f823..3a4f1c7d80 100644
--- a/ceilometer/templates/configmap-etc.yaml
+++ b/ceilometer/templates/configmap-etc.yaml
@@ -15,37 +15,10 @@ limitations under the License.
{{- if .Values.manifests.configmap_etc }}
{{- $envAll := . }}
-{{- if empty .Values.conf.ceilometer.keystone_authtoken.auth_uri -}}
-{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ceilometer.keystone_authtoken "auth_uri" -}}
-{{- end -}}
-
-{{- if empty .Values.conf.ceilometer.keystone_authtoken.auth_url -}}
-{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ceilometer.keystone_authtoken "auth_url" -}}
-{{- end -}}
-
-{{- if empty .Values.conf.ceilometer.keystone_authtoken.memcached_servers -}}
-{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.ceilometer.keystone_authtoken "memcached_servers" -}}
-{{- end -}}
-{{- if empty .Values.conf.ceilometer.keystone_authtoken.memcache_secret_key -}}
-{{- $_ := set .Values.conf.ceilometer.keystone_authtoken "memcache_secret_key" ( default ( randAlphaNum 64 ) .Values.endpoints.oslo_cache.auth.memcache_secret_key ) -}}
-{{- end -}}
-
{{- if empty .Values.conf.ceilometer.cache.memcache_servers -}}
{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set .Values.conf.ceilometer.cache "memcache_servers" -}}
{{- end -}}
-{{- if empty .Values.conf.ceilometer.database.connection -}}
-{{- $_ := tuple "oslo_db" "internal" "ceilometer" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.ceilometer.database "connection" -}}
-{{- end -}}
-
-{{- if empty .Values.conf.ceilometer.database.event_connection -}}
-{{- $_ := tuple "mongodb" "internal" "ceilometer" "mongodb" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.ceilometer.database "event_connection" -}}
-{{- end -}}
-
-{{- if empty .Values.conf.ceilometer.database.metering_connection -}}
-{{- $_ := tuple "mongodb" "internal" "ceilometer" "mongodb" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.ceilometer.database "metering_connection" -}}
-{{- end -}}
-
{{- if empty .Values.conf.ceilometer.DEFAULT.transport_url -}}
{{- $_ := tuple "oslo_messaging" "internal" "ceilometer" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.ceilometer.DEFAULT "transport_url" -}}
{{- end -}}
@@ -58,25 +31,6 @@ limitations under the License.
{{- $_ := tuple "oslo_messaging" "internal" "ceilometer" "amqp" . | include "helm-toolkit.endpoints.authenticated_transport_endpoint_uri_lookup" | set .Values.conf.ceilometer.notification "messaging_urls" -}}
{{- end -}}
-{{- if empty .Values.conf.ceilometer.keystone_authtoken.region_name -}}
-{{- $_ := set .Values.conf.ceilometer.keystone_authtoken "region_name" .Values.endpoints.identity.auth.ceilometer.region_name -}}
-{{- end -}}
-{{- if empty .Values.conf.ceilometer.keystone_authtoken.project_name -}}
-{{- $_ := set .Values.conf.ceilometer.keystone_authtoken "project_name" .Values.endpoints.identity.auth.ceilometer.project_name -}}
-{{- end -}}
-{{- if empty .Values.conf.ceilometer.keystone_authtoken.project_domain_name -}}
-{{- $_ := set .Values.conf.ceilometer.keystone_authtoken "project_domain_name" .Values.endpoints.identity.auth.ceilometer.project_domain_name -}}
-{{- end -}}
-{{- if empty .Values.conf.ceilometer.keystone_authtoken.user_domain_name -}}
-{{- $_ := set .Values.conf.ceilometer.keystone_authtoken "user_domain_name" .Values.endpoints.identity.auth.ceilometer.user_domain_name -}}
-{{- end -}}
-{{- if empty .Values.conf.ceilometer.keystone_authtoken.username -}}
-{{- $_ := set .Values.conf.ceilometer.keystone_authtoken "username" .Values.endpoints.identity.auth.ceilometer.username -}}
-{{- end -}}
-{{- if empty .Values.conf.ceilometer.keystone_authtoken.password -}}
-{{- $_ := set .Values.conf.ceilometer.keystone_authtoken "password" .Values.endpoints.identity.auth.ceilometer.password -}}
-{{- end -}}
-
{{- if empty .Values.conf.ceilometer.service_credentials.auth_url -}}
{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ceilometer.service_credentials "auth_url" -}}
{{- end -}}
@@ -103,10 +57,6 @@ limitations under the License.
{{- $_ := tuple "metric" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ceilometer.dispatcher_gnocchi "url" -}}
{{- end -}}
-{{- if empty .Values.conf.ceilometer.api.aodh_url -}}
-{{- $_ := tuple "alarming" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.ceilometer.api "aodh_url" -}}
-{{- end -}}
-
---
apiVersion: v1
kind: Secret
@@ -116,9 +66,6 @@ type: Opaque
data:
rally_tests.yaml: {{ toYaml .Values.conf.rally_tests | b64enc }}
ceilometer.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.ceilometer | b64enc }}
- api_paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
- policy.yaml: {{ toYaml .Values.conf.policy | b64enc }}
- api_audit_map.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.api_audit_map | b64enc }}
event_pipeline.yaml: {{ toYaml .Values.conf.event_pipeline | b64enc }}
pipeline.yaml: {{ toYaml .Values.conf.pipeline | b64enc }}
event_definitions.yaml: {{ toYaml .Values.conf.event_definitions | b64enc }}
diff --git a/ceilometer/templates/deployment-api.yaml b/ceilometer/templates/deployment-api.yaml
deleted file mode 100644
index d82478aba3..0000000000
--- a/ceilometer/templates/deployment-api.yaml
+++ /dev/null
@@ -1,144 +0,0 @@
-{{/*
-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.
-*/}}
-
-{{- if .Values.manifests.deployment_api }}
-{{- $envAll := . }}
-
-{{- $mounts_ceilometer_api := .Values.pod.mounts.ceilometer_api.ceilometer_api }}
-{{- $mounts_ceilometer_api_init := .Values.pod.mounts.ceilometer_api.init_container }}
-
-{{- $serviceAccountName := "ceilometer-api" }}
-{{ tuple $envAll "api" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: ceilometer-api
- annotations:
- {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
- labels:
-{{ tuple $envAll "ceilometer" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
-spec:
- replicas: {{ .Values.pod.replicas.api }}
- selector:
- matchLabels:
-{{ tuple $envAll "ceilometer" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}
-{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
- template:
- metadata:
- labels:
-{{ tuple $envAll "ceilometer" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
- annotations:
-{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
- configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
- configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
-{{ tuple "ceilometer_api" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
- spec:
- serviceAccountName: {{ $serviceAccountName }}
- affinity:
-{{ tuple $envAll "ceilometer" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
- nodeSelector:
- {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }}
-{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }}
-{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }}
-{{ end }}
- terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }}
- initContainers:
-{{ tuple $envAll "api" $mounts_ceilometer_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
- containers:
- - name: ceilometer-api
-{{ tuple $envAll "ceilometer_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-{{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
- command:
- - /tmp/ceilometer-api.sh
- - start
- lifecycle:
- preStop:
- exec:
- command:
- - /tmp/ceilometer-api.sh
- - stop
- ports:
- - name: ce-api
- containerPort: {{ tuple "metering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
- readinessProbe:
- tcpSocket:
- port: {{ tuple "metering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
- volumeMounts:
- - name: pod-tmp
- mountPath: /tmp
- - name: pod-etc-ceilometer
- mountPath: /etc/ceilometer
- - name: ceilometer-etc
- mountPath: /etc/ceilometer/ceilometer.conf
- subPath: ceilometer.conf
- readOnly: true
- - name: ceilometer-etc
- mountPath: /etc/ceilometer/api_paste.ini
- subPath: api_paste.ini
- readOnly: true
- - name: ceilometer-etc
- mountPath: /etc/ceilometer/policy.yaml
- subPath: policy.yaml
- readOnly: true
- - name: ceilometer-etc
- mountPath: /etc/ceilometer/api_audit_map.conf
- subPath: api_audit_map.conf
- readOnly: true
- - name: ceilometer-etc
- mountPath: /etc/ceilometer/event_definitions.yaml
- subPath: event_definitions.yaml
- readOnly: true
- - name: ceilometer-etc
- mountPath: /etc/ceilometer/event_pipeline.yaml
- subPath: event_pipeline.yaml
- readOnly: true
- - name: ceilometer-etc
- mountPath: /etc/ceilometer/pipeline.yaml
- subPath: pipeline.yaml
- readOnly: true
- - name: ceilometer-etc
- mountPath: /etc/ceilometer/gnocchi_resources.yaml
- subPath: gnocchi_resources.yaml
- readOnly: true
- - name: ceilometer-etc
- mountPath: {{ .Values.conf.software.apache2.conf_dir }}/000-default.conf
- subPath: wsgi-ceilometer.conf
- readOnly: true
-{{- if .Values.conf.security }}
- - name: ceilometer-etc
- mountPath: {{ .Values.conf.software.apache2.conf_dir }}/security.conf
- subPath: security.conf
- readOnly: true
-{{- end }}
- - name: ceilometer-bin
- mountPath: /tmp/ceilometer-api.sh
- subPath: ceilometer-api.sh
- readOnly: true
-{{ if $mounts_ceilometer_api.volumeMounts }}{{ toYaml $mounts_ceilometer_api.volumeMounts | indent 12 }}{{ end }}
- volumes:
- - name: pod-tmp
- emptyDir: {}
- - name: pod-etc-ceilometer
- emptyDir: {}
- - name: ceilometer-etc
- secret:
- secretName: ceilometer-etc
- defaultMode: 0444
- - name: ceilometer-bin
- configMap:
- name: ceilometer-bin
- defaultMode: 0555
-{{ if $mounts_ceilometer_api.volumes }}{{ toYaml $mounts_ceilometer_api.volumes | indent 8 }}{{ end }}
-{{- end }}
diff --git a/ceilometer/templates/ingress-api.yaml b/ceilometer/templates/ingress-api.yaml
deleted file mode 100644
index b6451c520c..0000000000
--- a/ceilometer/templates/ingress-api.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{/*
-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.
-*/}}
-
-{{- if and .Values.manifests.ingress_api .Values.network.api.ingress.public }}
-{{- $ingressOpts := dict "envAll" . "backendServiceType" "metering" "backendPort" "ce-api" -}}
-{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
-{{- end }}
diff --git a/ceilometer/templates/job-db-drop.yaml b/ceilometer/templates/job-db-drop.yaml
deleted file mode 100644
index 609761b5da..0000000000
--- a/ceilometer/templates/job-db-drop.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{/*
-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.
-*/}}
-
-{{- if .Values.manifests.job_db_drop }}
-{{- $dbDropJob := dict "envAll" . "serviceName" "ceilometer" -}}
-{{- if .Values.pod.tolerations.ceilometer.enabled -}}
-{{- $_ := set $dbDropJob "tolerationsEnabled" true -}}
-{{- end -}}
-{{ $dbDropJob | include "helm-toolkit.manifests.job_db_drop_mysql" }}
-{{- end }}
diff --git a/ceilometer/templates/job-db-init-mongodb.yaml b/ceilometer/templates/job-db-init-mongodb.yaml
deleted file mode 100644
index c8fdda998d..0000000000
--- a/ceilometer/templates/job-db-init-mongodb.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-{{/*
-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.
-*/}}
-
-{{- if .Values.manifests.job_db_init_mongodb }}
-{{- $envAll := . }}
-
-{{- $serviceAccountName := "ceilometer-db-init-mongodb" }}
-{{ tuple $envAll "db_init_mongodb" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
----
-apiVersion: batch/v1
-kind: Job
-metadata:
- name: ceilometer-db-init-mongodb
- annotations:
- {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
-spec:
- template:
- spec:
- serviceAccountName: {{ $serviceAccountName }}
- restartPolicy: OnFailure
- nodeSelector:
- {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
-{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }}
-{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 10 }}
-{{ end }}
- initContainers:
-{{ tuple $envAll "db_init_mongodb" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
- containers:
- - name: ceilometer-db-init-mongodb
-{{ tuple $envAll "db_init_mongodb" | include "helm-toolkit.snippets.image" | indent 10 }}
-{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init_mongodb | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
- env:
- - name: ROOT_DB_CONNECTION
- valueFrom:
- secretKeyRef:
- name: {{ .Values.secrets.mongodb.admin }}
- key: DB_CONNECTION
- - name: USER_DB_CONNECTION
- valueFrom:
- secretKeyRef:
- name: {{ .Values.secrets.mongodb.ceilometer }}
- key: DB_CONNECTION
- command:
- - /tmp/db-init-mongodb.sh
- volumeMounts:
- - name: pod-tmp
- mountPath: /tmp
- - name: ceilometer-bin
- mountPath: /tmp/db-init-mongodb.sh
- subPath: db-init-mongodb.sh
- readOnly: true
- volumes:
- - name: pod-tmp
- emptyDir: {}
- - name: ceilometer-bin
- configMap:
- name: ceilometer-bin
- defaultMode: 0555
-{{- end }}
diff --git a/ceilometer/templates/job-db-init.yaml b/ceilometer/templates/job-db-init.yaml
deleted file mode 100644
index 9df4521fe5..0000000000
--- a/ceilometer/templates/job-db-init.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{/*
-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.
-*/}}
-
-{{- if .Values.manifests.job_db_init }}
-{{- $dbInitJob := dict "envAll" . "serviceName" "ceilometer" -}}
-{{- if .Values.pod.tolerations.ceilometer.enabled -}}
-{{- $_ := set $dbInitJob "tolerationsEnabled" true -}}
-{{- end -}}
-{{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }}
-{{- end }}
diff --git a/ceilometer/templates/job-ks-endpoints.yaml b/ceilometer/templates/job-ks-endpoints.yaml
deleted file mode 100644
index 87735baf1e..0000000000
--- a/ceilometer/templates/job-ks-endpoints.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{/*
-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.
-*/}}
-
-{{- if .Values.manifests.job_ks_endpoints }}
-{{- $ksEndpointsJob := dict "envAll" . "serviceName" "ceilometer" "serviceTypes" ( tuple "metering" ) -}}
-{{- if .Values.pod.tolerations.ceilometer.enabled -}}
-{{- $_ := set $ksEndpointsJob "tolerationsEnabled" true -}}
-{{- end -}}
-{{ $ksEndpointsJob | include "helm-toolkit.manifests.job_ks_endpoints" }}
-{{- end }}
diff --git a/ceilometer/templates/job-ks-service.yaml b/ceilometer/templates/job-ks-service.yaml
deleted file mode 100644
index ea7dff79a1..0000000000
--- a/ceilometer/templates/job-ks-service.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-{{/*
-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.
-*/}}
-
-{{- if .Values.manifests.job_ks_service }}
-{{- $ksServiceJob := dict "envAll" . "serviceName" "ceilometer" "serviceTypes" ( tuple "metering" ) -}}
-{{- if .Values.pod.tolerations.ceilometer.enabled -}}
-{{- $_ := set $ksServiceJob "tolerationsEnabled" true -}}
-{{- end -}}
-{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }}
-{{- end }}
diff --git a/ceilometer/templates/pdb-api.yaml b/ceilometer/templates/pdb-api.yaml
deleted file mode 100644
index 7e46f90b4e..0000000000
--- a/ceilometer/templates/pdb-api.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-{{/*
-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.
-*/}}
-
-{{- if .Values.manifests.pdb_api }}
-{{- $envAll := . }}
----
-apiVersion: policy/v1
-kind: PodDisruptionBudget
-metadata:
- name: ceilometer-api
-spec:
- minAvailable: {{ .Values.pod.lifecycle.disruption_budget.api.min_available }}
- selector:
- matchLabels:
- app: ceilometer-api
-{{- end }}
diff --git a/ceilometer/templates/pod-rally-test.yaml b/ceilometer/templates/pod-rally-test.yaml
deleted file mode 100644
index 040836e5fc..0000000000
--- a/ceilometer/templates/pod-rally-test.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-{{/*
-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.
-*/}}
-
-{{- if .Values.manifests.pod_rally_test }}
-{{- $envAll := . }}
-
-{{- $mounts_tests := .Values.pod.mounts.ceilometer_tests.ceilometer_tests }}
-{{- $mounts_tests_init := .Values.pod.mounts.ceilometer_tests.init_container }}
-
-{{- $serviceAccountName := print $envAll.Release.Name "-test" }}
-{{ tuple $envAll "tests" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
----
-apiVersion: v1
-kind: Pod
-metadata:
- name: {{ print $envAll.Release.Name "-test" }}
- annotations:
- "helm.sh/hook": test-success
- {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
-spec:
- restartPolicy: Never
- nodeSelector:
- {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }}
-{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }}
-{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 2 }}
-{{ end }}
- serviceAccountName: {{ $serviceAccountName }}
- initContainers:
-{{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
- - name: {{ .Release.Name }}-test-ks-user
-{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }}
-{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
- command:
- - /tmp/ks-user.sh
- volumeMounts:
- - name: pod-tmp
- mountPath: /tmp
- - name: ceilometer-bin
- mountPath: /tmp/ks-user.sh
- subPath: ks-user.sh
- readOnly: true
- env:
-{{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}
-{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 8 }}
-{{- end }}
- - name: SERVICE_OS_SERVICE_NAME
- value: "test"
-{{- with $env := dict "ksUserSecret" .Values.secrets.identity.test }}
-{{- include "helm-toolkit.snippets.keystone_user_create_env_vars" $env | indent 8 }}
-{{- end }}
- - name: SERVICE_OS_ROLE
- value: {{ .Values.endpoints.identity.auth.test.role | quote }}
- containers:
- - name: {{ .Release.Name }}-test
-{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }}
-{{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
- env:
-{{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}
-{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 8 }}
-{{- end }}
-{{- with $env := dict "ksUserSecret" .Values.secrets.identity.test }}
-{{- include "helm-toolkit.snippets.keystone_user_create_env_vars" $env | indent 8 }}
-{{- end }}
- - name: RALLY_ENV_NAME
- value: {{.Release.Name}}
- command:
- - /tmp/rally-test.sh
- volumeMounts:
- - name: pod-tmp
- mountPath: /tmp
- - name: ceilometer-etc
- mountPath: /etc/rally/rally_tests.yaml
- subPath: rally_tests.yaml
- readOnly: true
- - name: ceilometer-bin
- mountPath: /tmp/rally-test.sh
- subPath: rally-test.sh
- readOnly: true
- - name: rally-db
- mountPath: /var/lib/rally
-{{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }}
- volumes:
- - name: pod-tmp
- emptyDir: {}
- - name: ceilometer-etc
- secret:
- secretName: ceilometer-etc
- defaultMode: 0444
- - name: ceilometer-bin
- configMap:
- name: ceilometer-bin
- defaultMode: 0555
- - name: rally-db
- emptyDir: {}
-{{ if $mounts_tests.volumes }}{{ toYaml $mounts_tests.volumes | indent 4 }}{{ end }}
-{{- end }}
diff --git a/ceilometer/templates/secret-db.yaml b/ceilometer/templates/secret-db.yaml
deleted file mode 100644
index 43300155fa..0000000000
--- a/ceilometer/templates/secret-db.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-{{/*
-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.
-*/}}
-
-{{- if .Values.manifests.secret_db }}
-{{- $envAll := . }}
-{{- range $key1, $userClass := tuple "admin" "ceilometer" }}
-{{- $secretName := index $envAll.Values.secrets.oslo_db $userClass }}
----
-apiVersion: v1
-kind: Secret
-metadata:
- name: {{ $secretName }}
- annotations:
-{{ tuple "oslo_db" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }}
-type: Opaque
-data:
- DB_CONNECTION: {{ tuple "oslo_db" "internal" $userClass "mysql" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}}
-{{- end }}
-{{- end }}
diff --git a/ceilometer/templates/secret-mongodb.yaml b/ceilometer/templates/secret-mongodb.yaml
deleted file mode 100644
index e7433131f4..0000000000
--- a/ceilometer/templates/secret-mongodb.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-{{/*
-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.
-*/}}
-
-{{- if .Values.manifests.secret_mongodb }}
-{{- $envAll := . }}
-{{- range $key1, $userClass := tuple "admin" "ceilometer" }}
-{{- $secretName := index $envAll.Values.secrets.mongodb $userClass }}
----
-apiVersion: v1
-kind: Secret
-metadata:
- name: {{ $secretName }}
- annotations:
-{{ tuple "mongodb" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }}
-type: Opaque
-data:
- DB_CONNECTION: {{ tuple "mongodb" "internal" $userClass "mongodb" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}}
-{{- end }}
-{{- end }}
diff --git a/ceilometer/templates/service-api.yaml b/ceilometer/templates/service-api.yaml
deleted file mode 100644
index 4acd8ab7cc..0000000000
--- a/ceilometer/templates/service-api.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-{{/*
-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.
-*/}}
-
-{{- if .Values.manifests.service_api }}
-{{- $envAll := . }}
----
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ tuple "metering" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
-spec:
- ports:
- - name: ce-api
- port: {{ tuple "metering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
- {{ if .Values.network.api.node_port.enabled }}
- nodePort: {{ .Values.network.api.node_port.port }}
- {{ end }}
- selector:
-{{ tuple $envAll "ceilometer" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
- {{ if .Values.network.api.node_port.enabled }}
- type: NodePort
- {{ end }}
-{{- end }}
diff --git a/ceilometer/templates/service-ingress-api.yaml b/ceilometer/templates/service-ingress-api.yaml
deleted file mode 100644
index 87f5610d72..0000000000
--- a/ceilometer/templates/service-ingress-api.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{{/*
-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.
-*/}}
-
-{{- if and .Values.manifests.service_ingress_api .Values.network.api.ingress.public }}
-{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "metering" -}}
-{{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }}
-{{- end }}
diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml
index 941a8f0b51..a84143ddc5 100644
--- a/ceilometer/values.yaml
+++ b/ceilometer/values.yaml
@@ -19,9 +19,6 @@
release_group: null
labels:
- api:
- node_selector_key: openstack-control-plane
- node_selector_value: enabled
compute:
node_selector_key: openstack-compute-node
node_selector_value: enabled
@@ -43,15 +40,8 @@ labels:
images:
tags:
- test: docker.io/xrally/xrally-openstack:2.0.0
- db_init_mongodb: docker.io/mongo:3.4.9-jessie
- db_init: docker.io/kolla/ubuntu-source-ceilometer-api:wallaby
- ceilometer_db_sync: docker.io/kolla/ubuntu-source-ceilometer-api:wallaby
rabbit_init: docker.io/rabbitmq:3.13-management
ks_user: quay.io/airshipit/heat:2024.1-ubuntu_jammy
- ks_service: quay.io/airshipit/heat:2024.1-ubuntu_jammy
- ks_endpoints: quay.io/airshipit/heat:2024.1-ubuntu_jammy
- ceilometer_api: docker.io/kolla/ubuntu-source-ceilometer-api:wallaby
ceilometer_central: docker.io/kolla/ubuntu-source-ceilometer-central:wallaby
ceilometer_compute: docker.io/kolla/ubuntu-source-ceilometer-compute:wallaby
ceilometer_ipmi: docker.io/kolla/ubuntu-source-ceilometer-base:wallaby
@@ -65,98 +55,9 @@ images:
- dep_check
- image_repo_sync
-network:
- api:
- ingress:
- public: true
- classes:
- namespace: "nginx"
- cluster: "nginx-cluster"
- annotations:
- nginx.ingress.kubernetes.io/rewrite-target: /
- port: 8777
- node_port:
- enabled: false
- port: 38777
-
ipmi_device: /dev/ipmi0
conf:
- security: |
- #
- # Disable access to the entire file system except for the directories that
- # are explicitly allowed later.
- #
- # This currently breaks the configurations that come with some web application
- # Debian packages.
- #
- #
- # AllowOverride None
- # Require all denied
- #
-
- # Changing the following options will not really affect the security of the
- # server, but might make attacks slightly more difficult in some cases.
-
- #
- # ServerTokens
- # This directive configures what you return as the Server HTTP response
- # Header. The default is 'Full' which sends information about the OS-Type
- # and compiled in modules.
- # Set to one of: Full | OS | Minimal | Minor | Major | Prod
- # where Full conveys the most information, and Prod the least.
- ServerTokens Prod
-
- #
- # Optionally add a line containing the server version and virtual host
- # name to server-generated pages (internal error documents, FTP directory
- # listings, mod_status and mod_info output etc., but not CGI generated
- # documents or custom error documents).
- # Set to "EMail" to also include a mailto: link to the ServerAdmin.
- # Set to one of: On | Off | EMail
- ServerSignature Off
-
- #
- # Allow TRACE method
- #
- # Set to "extended" to also reflect the request body (only for testing and
- # diagnostic purposes).
- #
- # Set to one of: On | Off | extended
- TraceEnable Off
-
- #
- # Forbid access to version control directories
- #
- # If you use version control systems in your document root, you should
- # probably deny access to their directories. For example, for subversion:
- #
- #
- # Require all denied
- #
-
- #
- # Setting this header will prevent MSIE from interpreting files as something
- # else than declared by the content type in the HTTP headers.
- # Requires mod_headers to be enabled.
- #
- #Header set X-Content-Type-Options: "nosniff"
-
- #
- # Setting this header will prevent other sites from embedding pages from this
- # site as frames. This defends against clickjacking attacks.
- # Requires mod_headers to be enabled.
- #
- #Header set X-Frame-Options: "sameorigin"
- software:
- apache2:
- binary: apache2
- start_parameters: -DFOREGROUND
- site_dir: /etc/apache2/sites-enable
- conf_dir: /etc/apache2/conf-enabled
- mods_dir: /etc/apache2/mods-available
- a2enmod: null
- a2dismod: null
ceilometer:
DEFAULT:
event_dispatchers:
@@ -168,23 +69,13 @@ conf:
values:
- database
- gnocchi
- api:
- aodh_is_enabled: "False"
- # NOTE(portdirect): the following option will turn off the ability to retrieve
- # metrics via the ceilometer API:
- # gnocchi_is_enabled: "True"
dispatcher_gnocchi:
- filter_service_activity: False
+ filter_service_activity: false
archive_policy: low
resources_definition_file: /etc/ceilometer/gnocchi_resources.yaml
- database:
- max_retries: -1
dispatcher:
archive_policy: low
filter_project: service
- keystone_authtoken:
- auth_type: password
- auth_version: v3
service_credentials:
auth_type: password
interface: internal
@@ -204,8 +95,6 @@ conf:
topics:
- notifications
- profiler
- oslo_policy:
- policy_file: /etc/ceilometer/policy.yaml
cache:
enabled: true
backend: dogpile.cache.memcached
@@ -1328,26 +1217,6 @@ conf:
service_id: $.payload.service_id
instance_type: $.payload.instance_type
instance_type_id: $.payload.instance_type_id
- paste:
- 'app:api-server':
- paste.app_factory: 'ceilometer.api.app:app_factory'
- 'filter:authtoken':
- paste.filter_factory: 'keystonemiddleware.auth_token:filter_factory'
- oslo_config_project: 'ceilometer'
- 'filter:audit':
- paste.filter_factory: 'keystonemiddleware.audit:filter_factory'
- audit_map_file: '/etc/ceilometer/api_audit_map.conf'
- 'filter:cors':
- oslo_config_project: 'ceilometer'
- paste.filter_factory: 'oslo_middleware.cors:filter_factory'
- 'filter:http_proxy_to_wsgi':
- oslo_config_project: 'ceilometer'
- paste.filter_factory: 'oslo_middleware.http_proxy_to_wsgi:HTTPProxyToWSGI.factory'
- 'filter:request_id':
- oslo_config_project: 'ceilometer'
- paste.filter_factory: 'oslo_middleware:RequestId.factory'
- 'pipeline:main':
- pipeline: cors http_proxy_to_wsgi request_id authtoken audit api-server
polling:
sources:
- name: all_pollsters
@@ -1410,7 +1279,7 @@ conf:
parameters:
target:
name: "cpu.delta"
- growth_only: True
+ growth_only: true
publishers:
- notifier://
- name: disk_sink
@@ -1443,100 +1312,6 @@ conf:
type: "gauge"
publishers:
- notifier://
- policy: {}
- audit_api_map:
- DEFAULT:
- target_endpoint_type: None
- path_keywords:
- meters: meter_name
- resources: resource_id
- statistics: None
- samples: sample_id
- service_endpoints:
- metering: service/metering
- wsgi_ceilometer: |
- Listen 0.0.0.0:{{ tuple "metering" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-
- LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-
-
- LogLevel info
- WSGIDaemonProcess ceilometer-api processes=2 threads=1 user=ceilometer group=ceilometer display-name=%{GROUP} python-path=/var/lib/kolla/venv/lib/python2.7/site-packages
- WSGIProcessGroup ceilometer-api
-
- WSGIScriptReloading On
- WSGIScriptAlias / /var/lib/kolla/venv/lib/python2.7/site-packages/ceilometer/api/app.wsgi
-
- WSGIApplicationGroup %{GLOBAL}
-
-
- Require all granted
-
- ErrorLog /dev/stdout
- CustomLog /dev/stdout combined
-
- rally_tests:
- CeilometerStats.create_meter_and_get_stats:
- - args:
- user_id: user-id
- resource_id: resource-id
- counter_volume: 1
- counter_unit: ''
- counter_type: cumulative
- runner:
- type: constant
- times: 1
- concurrency: 1
- sla:
- failure_rate:
- max: 0
- CeilometerMeters.list_meters:
- - runner:
- type: constant
- times: 1
- concurrency: 1
- sla:
- failure_rate:
- max: 0
- context:
- ceilometer:
- counter_name: benchmark_meter
- counter_type: gauge
- counter_unit: "%"
- counter_volume: 1
- resources_per_tenant: 1
- samples_per_resource: 1
- timestamp_interval: 10
- metadata_list:
- - status: active
- name: rally benchmark on
- deleted: 'false'
- - status: terminated
- name: rally benchmark off
- deleted: 'true'
- args:
- limit: 5
- metadata_query:
- status: terminated
- CeilometerQueries.create_and_query_samples:
- - args:
- filter:
- "=":
- counter_unit: instance
- orderby:
- limit: 10
- counter_name: cpu_util
- counter_type: gauge
- counter_unit: instance
- counter_volume: 1
- resource_id: resource_id
- runner:
- type: constant
- times: 1
- concurrency: 1
- sla:
- failure_rate:
- max: 0
dependencies:
dynamic:
@@ -1550,7 +1325,6 @@ dependencies:
static:
api:
jobs:
- - ceilometer-db-init-mongodb
- ceilometer-db-sync
- ceilometer-rabbit-init
- ceilometer-ks-user
@@ -1558,15 +1332,10 @@ dependencies:
services:
- endpoint: internal
service: identity
- - endpoint: internal
- service: oslo_db
- - endpoint: internal
- service: mongodb
- endpoint: internal
service: metric
central:
jobs:
- - ceilometer-db-init-mongodb
- ceilometer-db-sync
- ceilometer-rabbit-init
- ceilometer-ks-user
@@ -1576,13 +1345,10 @@ dependencies:
service: identity
- endpoint: internal
service: oslo_db
- - endpoint: internal
- service: mongodb
- endpoint: internal
service: metric
ipmi:
jobs:
- - ceilometer-db-init-mongodb
- ceilometer-db-sync
- ceilometer-rabbit-init
- ceilometer-ks-user
@@ -1592,13 +1358,10 @@ dependencies:
service: identity
- endpoint: internal
service: oslo_db
- - endpoint: internal
- service: mongodb
- endpoint: internal
service: metric
compute:
jobs:
- - ceilometer-db-init-mongodb
- ceilometer-db-sync
- ceilometer-rabbit-init
- ceilometer-ks-user
@@ -1608,37 +1371,12 @@ dependencies:
service: identity
- endpoint: internal
service: oslo_db
- - endpoint: internal
- service: mongodb
- endpoint: internal
service: metric
- db_init:
- services:
- - endpoint: internal
- service: oslo_db
- db_init_mongodb:
- services:
- - endpoint: internal
- service: mongodb
db_sync:
- jobs:
- - ceilometer-db-init
- - ceilometer-db-init-mongodb
services:
- - endpoint: internal
- service: oslo_db
- endpoint: internal
service: mongodb
- ks_endpoints:
- jobs:
- - ceilometer-ks-service
- services:
- - endpoint: internal
- service: identity
- ks_service:
- services:
- - endpoint: internal
- service: identity
ks_user:
services:
- endpoint: internal
@@ -1649,7 +1387,6 @@ dependencies:
endpoint: internal
notification:
jobs:
- - ceilometer-db-init-mongodb
- ceilometer-db-sync
- ceilometer-rabbit-init
- ceilometer-ks-user
@@ -1659,8 +1396,6 @@ dependencies:
service: identity
- endpoint: internal
service: oslo_db
- - endpoint: internal
- service: mongodb
- endpoint: internal
service: metric
tests:
@@ -1682,12 +1417,6 @@ secrets:
admin: ceilometer-keystone-admin
ceilometer: ceilometer-keystone-user
test: ceilometer-keystone-test
- oslo_db:
- admin: ceilometer-db-admin
- ceilometer: ceilometer-db-user
- mongodb:
- admin: ceilometer-mongodb-admin
- ceilometer: ceilometer-mongodb-user
oslo_messaging:
admin: ceilometer-rabbitmq-admin
ceilometer: ceilometer-rabbitmq-user
@@ -1771,21 +1500,6 @@ endpoints:
api:
default: 80
internal: 5000
- metering:
- name: ceilometer
- hosts:
- default: ceilometer-api
- public: ceilometer
- host_fqdn_override:
- default: null
- path:
- default: null
- scheme:
- default: 'http'
- port:
- api:
- default: 8777
- public: 80
metric:
name: gnocchi
hosts:
@@ -1816,40 +1530,6 @@ endpoints:
api:
default: 8042
public: 80
- oslo_db:
- auth:
- admin:
- username: root
- password: password
- ceilometer:
- username: ceilometer
- password: password
- hosts:
- default: mariadb
- host_fqdn_override:
- default: null
- path: /ceilometer
- scheme: mysql+pymysql
- port:
- mysql:
- default: 3306
- mongodb:
- auth:
- admin:
- username: root
- password: password
- ceilometer:
- username: ceilometer
- password: password
- hosts:
- default: mongodb
- host_fqdn_override:
- default: null
- path: /ceilometer
- scheme: mongodb
- port:
- mongodb:
- default: 27017
oslo_cache:
auth:
# NOTE(portdirect): this is used to define the value for keystone
@@ -1913,11 +1593,6 @@ pod:
ceilometer_tests:
volumeMounts:
volumes:
- ceilometer_api:
- init_container: null
- ceilometer_api:
- volumeMounts:
- volumes:
ceilometer_compute:
init_container: null
ceilometer_compute:
@@ -1943,7 +1618,6 @@ pod:
volumeMounts:
volumes:
replicas:
- api: 1
central: 1
notification: 1
lifecycle:
@@ -1960,21 +1634,8 @@ pod:
enabled: true
min_ready_seconds: 0
max_unavailable: 1
- disruption_budget:
- api:
- min_available: 0
- termination_grace_period:
- api:
- timeout: 600
resources:
enabled: true
- api:
- requests:
- memory: "128Mi"
- cpu: "100m"
- limits:
- memory: "1024Mi"
- cpu: "2000m"
compute:
requests:
memory: "128Mi"
@@ -2004,20 +1665,6 @@ pod:
memory: "1024Mi"
cpu: "2000m"
jobs:
- db_init:
- requests:
- memory: "128Mi"
- cpu: "100m"
- limits:
- memory: "1024Mi"
- cpu: "2000m"
- db_init_mongodb:
- requests:
- memory: "128Mi"
- cpu: "100m"
- limits:
- memory: "1024Mi"
- cpu: "2000m"
db_sync:
requests:
memory: "128Mi"
@@ -2032,20 +1679,6 @@ pod:
limits:
memory: "1024Mi"
cpu: "2000m"
- ks_endpoints:
- requests:
- memory: "128Mi"
- cpu: "100m"
- limits:
- memory: "1024Mi"
- cpu: "2000m"
- ks_service:
- requests:
- memory: "128Mi"
- cpu: "100m"
- limits:
- memory: "1024Mi"
- cpu: "2000m"
ks_user:
requests:
memory: "128Mi"
@@ -2068,40 +1701,19 @@ pod:
memory: "1024Mi"
cpu: "2000m"
-network_policy:
- ceilometer:
- ingress:
- - {}
- egress:
- - {}
-
manifests:
configmap_bin: true
configmap_etc: true
- deployment_api: true
deployment_central: true
daemonset_compute: true
daemonset_ipmi: false
deployment_notification: true
- ingress_api: true
job_bootstrap: true
- job_db_drop: false
- job_db_init: true
- job_db_init_mongodb: true
job_db_sync: true
job_image_repo_sync: true
- job_ks_endpoints: true
- job_ks_service: true
job_ks_user: true
job_rabbit_init: true
- pdb_api: true
- pod_rally_test: true
- network_policy: false
- secret_db: true
secret_keystone: true
- secret_mongodb: true
secret_rabbitmq: true
secret_registry: true
- service_api: true
- service_ingress_api: true
...
diff --git a/releasenotes/notes/ceilometer-ab177a5c0aad98df.yaml b/releasenotes/notes/ceilometer-ab177a5c0aad98df.yaml
new file mode 100644
index 0000000000..6ec9772071
--- /dev/null
+++ b/releasenotes/notes/ceilometer-ab177a5c0aad98df.yaml
@@ -0,0 +1,9 @@
+---
+ceilometer:
+ - |
+ Removed support for ceilometer-api, which was removed from ceilometer long
+ time ago.
+ - |
+ Removed support for oslo.db backend and mongodb backend of ceilometer,
+ which haven't been supported by ceulometer actually for multiple releases.
+...