Add telemetry to uni04delta-ipv6

openstack-k8s-operators · Aug 21, 2024 · 2c5d492 · 2c5d492
1 parent 449b690
commit 2c5d492
Show file tree

Hide file tree

Showing 6 changed files with 202 additions and 1 deletion.
diff --git a/dt/uni04delta-ipv6/edpm/nodeset/kustomization.yaml b/dt/uni04delta-ipv6/edpm/nodeset/kustomization.yaml
@@ -189,3 +189,75 @@ replacements:
           - spec.services
         options:
           create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.heat.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.heat.enabled
+        options:
+          create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.heat.customServiceConfig
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.heat.template.customServiceConfig
+        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.autoscaling.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.telemetry.template.autoscaling.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/dt/uni04delta-ipv6/kustomization.yaml b/dt/uni04delta-ipv6/kustomization.yaml
@@ -204,3 +204,75 @@ replacements:
           - spec.nova.template.cellTemplates
         options:
           create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.heat.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.heat.enabled
+        options:
+          create: true
+
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.heat.customServiceConfig
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.heat.template.customServiceConfig
+        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.autoscaling.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.telemetry.template.autoscaling.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/uni04delta-ipv6/README.md b/examples/dt/uni04delta-ipv6/README.md
@@ -54,6 +54,7 @@ and Manila OpenStack services configured with Ceph.
 | Horizon          | N/A             | Must have          |
 | Barbican         |                 | Must have          |
 | Ironic           |                 | Must have          |
+| Telemetry        |                 | Must have          |
 
 #### Support services
 
@@ -66,10 +67,14 @@ work properly and can be deployed with any/default configuration.
 | Neutron          | needed by other services   |
 | Nova             | needed by scenario testing |
 | Keystone         | needed by all services     |
+| Ceilometer       | needed by Telemetry        |
+| Heat             | needed by Telemetry        |
+| Prometheus       | needed by Telemetry        |
 
 #### Additional configuration
 
-Default settings: TLSe
+- Default settings: TLSe
+- Cluster Observability Operator is installed on the platform.
 
 ## Considerations/Constraints
 

diff --git a/examples/dt/uni04delta-ipv6/control-plane.md b/examples/dt/uni04delta-ipv6/control-plane.md
@@ -3,6 +3,40 @@
 ## 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/uni04delta-ipv6/control-plane/service-values.yaml b/examples/dt/uni04delta-ipv6/control-plane/service-values.yaml
@@ -168,3 +168,20 @@ data:
         datacentre: ocpbr
         octavia: octbr
         ironic: ironic
+
+  # Heat is required for telemetry autoscaling
+  heat:
+    enabled: true
+    customServiceConfig: |
+      [clients_heat]
+      endpoint_type: public
+      insecure: true
+
+  telemetry:
+    enabled: true
+    metricStorage:
+      enabled: true
+    autoscaling:
+      enabled: true
+    ceilometer:
+      enabled: true
diff --git a/examples/dt/uni04delta-ipv6/values.yaml b/examples/dt/uni04delta-ipv6/values.yaml
@@ -151,3 +151,4 @@ data:
       - neutron-metadata
       - libvirt
       - nova-custom-ceph
+      - telemetry