From c4a90395cf74b49c6c7d18b60ea727414b3743f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Wed, 9 Oct 2024 09:49:41 +0200 Subject: [PATCH] Enable telemetry in OSASINFRA DT Compared to uni01alpha that is the other DT to enable telemetry, we're not enabling autoscaling as it requires the additional heat service. Depends on https://github.com/openstack-k8s-operators/ci-framework/pull/2449. --- .../edpm-post-ceph/nodeset/kustomization.yaml | 36 +++++++++++++++++++ examples/dt/osasinfra/control-plane.md | 33 +++++++++++++++++ examples/dt/osasinfra/service-values.yaml | 7 ++++ examples/dt/osasinfra/values.yaml | 1 + 4 files changed, 77 insertions(+) diff --git a/dt/osasinfra/edpm-post-ceph/nodeset/kustomization.yaml b/dt/osasinfra/edpm-post-ceph/nodeset/kustomization.yaml index ca84cc20e..3ce9b6255 100644 --- a/dt/osasinfra/edpm-post-ceph/nodeset/kustomization.yaml +++ b/dt/osasinfra/edpm-post-ceph/nodeset/kustomization.yaml @@ -310,3 +310,39 @@ replacements: - spec.ovn.template.ovnController.nicMappings options: create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.telemetry.enabled + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.telemetry.enabled + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.telemetry.metricStorage.enabled + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.telemetry.template.metricStorage.enabled + options: + create: true + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.telemetry.ceilometer.enabled + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.telemetry.template.ceilometer.enabled + options: + create: true diff --git a/examples/dt/osasinfra/control-plane.md b/examples/dt/osasinfra/control-plane.md index 1b092033f..c34c9a2c4 100644 --- a/examples/dt/osasinfra/control-plane.md +++ b/examples/dt/osasinfra/control-plane.md @@ -3,6 +3,39 @@ ## Assumptions - A storage class called `local-storage` should already exist. +- Cluster observability operator is already deployed. If not, follow the + steps found [below](#cluster-observability-operator). + +### Cluster observability operator + +Cluster Observability Operator must be installed as it is required by OpenStack +Telemetry operator. If not installed, the below steps can be followed + +```bash +cat > subscription.yaml << EOF +--- +apiVersion: operators.coreos.com/v1alpha1 +kind: Subscription +metadata: + name: observability-operator + namespace: openshift-operators + labels: + operators.coreos.com/observability-operator.openshift-operators: "" +spec: + channel: development + installPlanApproval: Automatic + name: cluster-observability-operator + source: redhat-operators + sourceNamespace: openshift-marketplace +EOF + +# Apply the cr +oc apply -f subscription.yaml + +# Wait for the deployment to be ready +oc wait deployments/observability-operator --for condition=Available \ + --timeout=300s +``` ## Initialize diff --git a/examples/dt/osasinfra/service-values.yaml b/examples/dt/osasinfra/service-values.yaml index 448632911..e5dc4fe0e 100644 --- a/examples/dt/osasinfra/service-values.yaml +++ b/examples/dt/osasinfra/service-values.yaml @@ -113,3 +113,10 @@ data: nicMappings: datacentre: ocpbr octavia: octbr + + telemetry: + enabled: true + metricStorage: + enabled: true + ceilometer: + enabled: true diff --git a/examples/dt/osasinfra/values.yaml b/examples/dt/osasinfra/values.yaml index 617f07d42..232aefdda 100644 --- a/examples/dt/osasinfra/values.yaml +++ b/examples/dt/osasinfra/values.yaml @@ -15,6 +15,7 @@ data: - neutron-metadata - libvirt - nova + - telemetry ceph: conf: CHANGEME_CEPH_CONF keyring: CHANGEME_CEPH_KEYRING