Merge pull request #636 from cescgina/telemetry_watcher_uni05epsilon

Add Telemetry and Watcher to uniepsilon

Add Watcher to uniepsilon to test watcher volume migration capabilities.
In order to deploy Watcher, we need to also enable Telemetry, as it is a
hard-requirement. This PR copies the telemetry configuration from the
hci va, since that already sets up both Watcher and Telemetry.

Reviewed-by: Andrew Bays <[email protected]>

Author: softwarefactory-project-zuul[bot]

dt/uni05epsilon/edpm-post-ceph/nodeset/kustomization.yaml

@@ -385,3 +385,105 @@ replacements:
           - spec.swift.enabled
         options:
           create: true
+
+  #
+  # Notifications
+  #
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.notificationsBusInstance
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.notificationsBusInstance
+        options:
+          create: true
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.rabbitmq.templates.rabbitmq-notifications
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.rabbitmq.templates.rabbitmq-notifications
+        options:
+          create: true
+  #
+  # Telemetry
+  #
+  - 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
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.telemetry.template.metricStorage
+        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
+
+  #
+  # Watcher
+  #
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.watcher.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.watcher.enabled
+        options:
+          create: true
+  #
+  # Heat (required by Telemetry Autoscaling)
+  #
+  - source:
+      kind: ConfigMap
+      name: service-values
+      fieldPath: data.heat.enabled
+    targets:
+      - select:
+          kind: OpenStackControlPlane
+        fieldPaths:
+          - spec.heat.enabled
+        options:
+          create: true

examples/dt/uni05epsilon/README.md

@@ -55,6 +55,7 @@ Focused on verifying Cinder and Glance with multiple backends.
 | Neutron          | Geneve (OVN)            | Must have          |
 | Octavia (TODO)   | act-stby                | Must have          |
 | Swift            | (default)               | Must have          |
+| Watcher          | (default)               | Must have          |
 
 
 #### Support services
@@ -67,6 +68,8 @@ to work properly and can be deployed with any/default configuration.
 | ---------------- |--------------------------- |
 | Nova             | needed by scenario testing |
 | Keystone         | needed by all services     |
+| Telemetry        | needed by watcher          |
+| Heat             | needed by telemetry        |
 
 
 ### Additional configuration

examples/dt/uni05epsilon/deployment/values.yaml

@@ -16,3 +16,4 @@ data:
     - neutron-metadata
     - libvirt
     - nova-custom
+    - telemetry

examples/dt/uni05epsilon/service-values.yaml

@@ -9,6 +9,7 @@ metadata:
 
 data:
   preserveJobs: false
+  notificationsBusInstance: rabbitmq-notifications
 
   cinderBackup:
     customServiceConfig: |
@@ -142,6 +143,47 @@ data:
     templates:
       rabbitmq-cell2:
         replicas: 3
+      rabbitmq-notifications:
+        override:
+          service:
+            metadata:
+              annotations:
+                metallb.universe.tf/address-pool: internalapi
+                metallb.universe.tf/loadBalancerIPs: 172.17.0.87
+            spec:
+              type: LoadBalancer
+        replicas: 3
 
   swift:
     enabled: true
+
+  telemetry:
+    enabled: true
+    metricStorage:
+      enabled: true
+      monitoringStack: null
+      customMonitoringStack:
+        alertmanagerConfig:
+          disabled: true
+        prometheusConfig:
+          enableRemoteWriteReceiver: true
+          persistentVolumeClaim:
+            resources:
+              requests:
+                storage: 20G
+          replicas: 1
+          scrapeInterval: 30s
+        resourceSelector:
+          matchLabels:
+            service: metricStorage
+        retention: 24h
+    autoscaling:
+      enabled: true
+    ceilometer:
+      enabled: true
+
+  watcher:
+    enabled: true
+
+  heat:
+    enabled: true

examples/dt/uni05epsilon/values.yaml

@@ -30,6 +30,7 @@ data:
       - neutron-metadata
       - libvirt
       - nova-custom
+      - telemetry
 
   nova-extra-config: |
     # Additional overrides that can be set in environment-specific cases