diff --git a/dt/uni04delta-ipv6/edpm/nodeset/kustomization.yaml b/dt/uni04delta-ipv6/edpm/nodeset/kustomization.yaml index 3e3e8a4e1..375df44c6 100644 --- a/dt/uni04delta-ipv6/edpm/nodeset/kustomization.yaml +++ b/dt/uni04delta-ipv6/edpm/nodeset/kustomization.yaml @@ -189,3 +189,63 @@ replacements: - spec.services 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 + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.keystone.customServiceConfig + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.keystone.template.customServiceConfig + options: + create: true diff --git a/dt/uni04delta-ipv6/kustomization.yaml b/dt/uni04delta-ipv6/kustomization.yaml index 49c55b4f6..37affda58 100644 --- a/dt/uni04delta-ipv6/kustomization.yaml +++ b/dt/uni04delta-ipv6/kustomization.yaml @@ -92,3 +92,63 @@ replacements: name: ironic fieldPaths: - spec.config + + - 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 + + - source: + kind: ConfigMap + name: service-values + fieldPath: data.keystone.customServiceConfig + targets: + - select: + kind: OpenStackControlPlane + fieldPaths: + - spec.keystone.template.customServiceConfig + options: + create: true diff --git a/examples/dt/uni04delta-ipv6/README.md b/examples/dt/uni04delta-ipv6/README.md index 4b9666c54..adb708004 100644 --- 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/service-values.yaml b/examples/dt/uni04delta-ipv6/control-plane/service-values.yaml index b692b6c6d..d96bf8bb0 100644 --- a/examples/dt/uni04delta-ipv6/control-plane/service-values.yaml +++ b/examples/dt/uni04delta-ipv6/control-plane/service-values.yaml @@ -49,6 +49,11 @@ data: default: replicas: 3 + keystone: + customServiceConfig: | + [token] + expiration = 28800 + manila: enabled: true customServiceConfig: | @@ -172,3 +177,12 @@ data: heat: enabled: 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 index 01b89e8e3..2f1c0978b 100644 --- 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 diff --git a/lib/olm-deps/coo_subscription.yaml b/lib/olm-deps/coo_subscription.yaml new file mode 100644 index 000000000..6148123b1 --- /dev/null +++ b/lib/olm-deps/coo_subscription.yaml @@ -0,0 +1,14 @@ +--- +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 diff --git a/lib/olm-deps/kustomization.yaml b/lib/olm-deps/kustomization.yaml index 1cac76e67..9915eb288 100644 --- a/lib/olm-deps/kustomization.yaml +++ b/lib/olm-deps/kustomization.yaml @@ -12,3 +12,4 @@ resources: - nmstate_namespace.yaml - nmstate_operatorgroup.yaml - nmstate_subscription.yaml + - coo_subscription.yaml