diff --git a/ansible/roles/telco-core-ztp/defaults/main.yml b/ansible/roles/telco-core-ztp/defaults/main.yml index 126a196..3bc086f 100644 --- a/ansible/roles/telco-core-ztp/defaults/main.yml +++ b/ansible/roles/telco-core-ztp/defaults/main.yml @@ -4,6 +4,13 @@ # Currently only the 4.18 profile has been placed and adjusted for this testing in this repo telco_core_profile_version: 4.18 -# Enable means uncommented, so false means comment out for now +# Enable overriding the clusterlogging subscription reference CR channel +telco_core_reference_cluster_logging_channel_override_enable: true +telco_core_reference_cluster_logging_channel_override: stable-6.1 + +# Enabling a cluster logging version refers to enabling a specific target version for +# the cluster logging operator status to be compliant with. Setting as false means the +# version will be commented and your policy will be compliant regardless of the version +# of the cluster logging operator installed. telco_core_cluster_logging_version_enable: false telco_core_cluster_logging_version: cluster-logging.v6.0.0 diff --git a/ansible/roles/telco-core-ztp/files/release-4.18/reference-crs/optional/logging/ClusterLogSubscription.yaml b/ansible/roles/telco-core-ztp/files/release-4.18/reference-crs/optional/logging/ClusterLogSubscription.yaml index 7061a75..f313c7b 100644 --- a/ansible/roles/telco-core-ztp/files/release-4.18/reference-crs/optional/logging/ClusterLogSubscription.yaml +++ b/ansible/roles/telco-core-ztp/files/release-4.18/reference-crs/optional/logging/ClusterLogSubscription.yaml @@ -5,7 +5,7 @@ metadata: name: cluster-logging namespace: openshift-logging spec: - channel: "stable-6.1" + channel: "stable-6.0" name: cluster-logging source: redhat-operators-disconnected sourceNamespace: openshift-marketplace diff --git a/ansible/roles/telco-core-ztp/templates/release-4.18/core-baseline.yaml b/ansible/roles/telco-core-ztp/templates/release-4.18/core-baseline.yaml index 5d36d6e..ac1e2f4 100644 --- a/ansible/roles/telco-core-ztp/templates/release-4.18/core-baseline.yaml +++ b/ansible/roles/telco-core-ztp/templates/release-4.18/core-baseline.yaml @@ -32,6 +32,15 @@ policies: - path: reference-crs/optional/logging/ClusterLogNS.yaml - path: reference-crs/optional/logging/ClusterLogOperGroup.yaml - path: reference-crs/optional/logging/ClusterLogSubscription.yaml +{% if telco_core_reference_cluster_logging_channel_override_enable %} + patches: + - spec: + channel: "{{ telco_core_reference_cluster_logging_channel_override }}" +{% else %} + # patches: + # - spec: + # channel: "{{ telco_core_reference_cluster_logging_channel_override }}" +{% endif %} - path: reference-crs/optional/logging/ClusterLogOperatorStatus.yaml patches: - status: