2 次代码提交 b7ddcecc93 ... efb690a1c4

作者 SHA1 备注 提交日期
  Grega Bremec efb690a1c4 add sakbf prep role 4 周之前
  Grega Bremec 7c5e7caf5a re-enable tmp disabled operators 4 周之前
共有 3 个文件被更改,包括 25 次插入15 次删除
  1. 14 14
      playbooks/inventory.yml
  2. 9 0
      playbooks/pre-flight.yml
  3. 2 1
      playbooks/roles/setup-for-sakbf/tasks/main.yml

+ 14 - 14
playbooks/inventory.yml

@@ -15,20 +15,20 @@ all:
 
     # Operators that need to be installed.
     added_operators:
-#      - catalog: redhat-operators
-#        package: amq-streams
-#        channel: amq-streams-2.9.x
-#        namespace: openshift-operators
-#        desired_csv: amqstreams.v2.9.3-1
-#        og_namespaces: []
-#        approval: Manual
-#      - catalog: redhat-operators
-#        package: service-registry-operator
-#        channel: 2.x
-#        namespace: openshift-operators
-#        desired_csv: service-registry-operator.v2.6.13-r2-0.1763986602.p
-#        og_namespaces: []
-#        approval: Manual
+      - catalog: redhat-operators
+        package: amq-streams
+        channel: amq-streams-2.9.x
+        namespace: openshift-operators
+        desired_csv: amqstreams.v2.9.3-1
+        og_namespaces: []
+        approval: Manual
+      - catalog: redhat-operators
+        package: service-registry-operator
+        channel: 2.x
+        namespace: openshift-operators
+        desired_csv: service-registry-operator.v2.6.13-r2-0.1763986602.p
+        og_namespaces: []
+        approval: Manual
       - catalog: certified-operators
         package: elasticsearch-eck-operator-certified
         channel: stable

+ 9 - 0
playbooks/pre-flight.yml

@@ -50,4 +50,13 @@
       tags:
         - workstation
         - ad482
+    - include_role:
+        name: setup-for-sakbf
+        apply:
+          tags:
+            - workstation
+            - sakbf
+      tags:
+        - workstation
+        - sakbf
 ...

+ 2 - 1
playbooks/roles/setup-for-sakbf/tasks/main.yml

@@ -1,6 +1,7 @@
 ---
+# Sets the lab env up for Streams BF labs.
 #
-# TODO: set java/javac back to 21 (for the custom part)
+# For now, just resets the Java alternatives back to Java 21.
 #
 - name: Ensure Java is versioned correctly for Streams BF labs
   become: yes