[ansible-lint] Fix ansible-lint in PR#445 changes

Rebased and fixed linting in the changes introduced
as part of the PR#455

#455

build/stf-run-ci/tasks/pre-clean.yml

@@ -51,7 +51,7 @@
 # Upstream Source + Sub from https://github.com/rhobs/observability-operator/tree/main/hack/olm
 # Moved to using Community Operators Catalog, so no longer require upstream CatalogSource. Eventually move to Red Hat Operators CatalogSource.
 - name: Remove Red Hat Observability Operator CatalogSource if it is installed
- k8s:
+ kubernetes.core.k8s:
  state: absent
  definition:
  apiVersion: operators.coreos.com/v1alpha1

build/stf-run-ci/tasks/setup_base.yml

@@ -164,48 +164,3 @@
  until: eckCRD.resources[0] is defined
  retries: 5
  delay: 30
-<<<<<<< HEAD
-=======
-
-- block:
- # Upstream Source + Sub from https://github.com/rhobs/observability-operator/tree/main/hack/olm
- - name: Create CatalogSource for Red Hat Observability Operator
- kubernetes.core.k8s:
- definition:
- apiVersion: operators.coreos.com/v1alpha1
- kind: CatalogSource
- metadata:
- annotations:
- name: observability-operator
- namespace: openshift-marketplace
- spec:
- displayName: Observability Operator - Test
- icon:
- base64data: ""
- mediatype: ""
- image: quay.io/rhobs/observability-operator-catalog:latest
- publisher: Sunil Thaha
- sourceType: grpc
- updateStrategy:
- registryPoll:
- interval: 10m0s
-
- - name: Subscribe to Red Hat Obervability Operator
- kubernetes.core.k8s:
- definition:
- apiVersion: operators.coreos.com/v1alpha1
- kind: Subscription
- metadata:
- labels:
- operators.coreos.com/observability-operator.openshift-operators: ""
- name: observability-operator
- namespace: openshift-operators
- spec:
- channel: development
- installPlanApproval: Automatic
- name: observability-operator
- source: observability-operator
- sourceNamespace: openshift-marketplace
- when:
- - __service_telemetry_observability_strategy in ['use_redhat', 'use_hybrid']
->>>>>>> d5592c0 ([ansible-lint] Use fqcn for modules)