소스 검색

refactored roles to enable installation of multiple operators - reflect this in inventory vars

Grega Bremec 7 달 전
부모
커밋
827232e1c0
1개의 변경된 파일27개의 추가작업 그리고 6개의 파일을 삭제
  1. 27 6
      playbooks/inventory.yml

+ 27 - 6
playbooks/inventory.yml

@@ -13,12 +13,33 @@ all:
     ocp_maj: "4.14"
     ocp_z: "4.14.12"
 
-    # Operator that needs to be installed.
-    op_cat: redhat-operators
-    op_pkg: openshift-pipelines-operator-rh
-    op_chn: latest
-    op_nsp: openshift-operators
-    desired_csv: openshift-pipelines-operator-rh.v1.15.1
+    # Catalog source verification coordinates.
+    vrfy_cat: redhat-operators
+    vrfy_pkg: cluster-logging
+    vrfy_csv: cluster-logging.v5.9.6
+
+    # Operators that needs to be installed.
+    operators:
+      - op_cat: redhat-operators
+        op_pkg: openshift-pipelines-operator-rh
+        op_chn: latest
+        op_nsp: openshift-operators-redhat
+        op_mod: all
+        desired_csv: openshift-pipelines-operator-rh.v1.15.1
+
+      - op_cat: redhat-operators
+        op_pkg: loki-operator
+        op_chn: stable
+        op_nsp: openshift-operators-redhat
+        op_mod: all
+        desired_csv: loki-operator.v5.9.6
+
+      - op_cat: redhat-operators
+        op_pkg: cluster-logging
+        op_chn: stable
+        op_nsp: openshift-logging
+        op_mod: self
+        desired_csv: cluster-logging.v5.9.6
 
     # The list of OpenShift clusters check-env will try to connect to.
     clusters: