From cc7515e6635a037869a00a67a675c493b31bc87b Mon Sep 17 00:00:00 2001
From: rickgcv <57412427+rickgcv@users.noreply.github.com>
Date: Fri, 17 Sep 2021 17:13:57 +0100
Subject: [PATCH] Fixed issue with Camel K operator for SAP serverless ex. in
 SAP Digital Platform Summit lab (#4107)

* Added Pacemaker cluster creation to the Tower workflows in SAP E2E lab

* add lifecycle_hook_post_start.yml to sap-integration lab to fix the issues of pods not starting up when the environment is restarted

* add lifecycle_hook_post_start.yml to sap-integration lab to fix the issues of pods not starting up when the environment is restarted

* Use beta repos to match the subscription used

* Updated Camel K operator

* Deleted reference to old Camel K snapshot
---
 .../sap-integration/files/k8s/camelk_catalosource.j2 | 10 ----------
 .../sap-integration/files/k8s/camelk_subscription.j2 |  2 +-
 ansible/configs/sap-smart/default_vars.yml           |  2 ++
 ansible/configs/sap-smart/sat_workload.yml           | 12 ++++++------
 4 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 ansible/configs/sap-integration/files/k8s/camelk_catalosource.j2

diff --git a/ansible/configs/sap-integration/files/k8s/camelk_catalosource.j2 b/ansible/configs/sap-integration/files/k8s/camelk_catalosource.j2
deleted file mode 100644
index eea2ca8bdd5..00000000000
--- a/ansible/configs/sap-integration/files/k8s/camelk_catalosource.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: operators.coreos.com/v1alpha1
-kind: CatalogSource
-metadata:
-  name: community-operators-snapshot-christina
-  namespace: openshift-marketplace
-spec:
- sourceType: grpc
- image: quay.io/gpte-devops-automation/olm_snapshot_community_catalog:v4.6_2021_03_09
- displayName: "Red Hat Operators Snapshot (2021)"
- publisher: "TMM"
\ No newline at end of file
diff --git a/ansible/configs/sap-integration/files/k8s/camelk_subscription.j2 b/ansible/configs/sap-integration/files/k8s/camelk_subscription.j2
index 8005b3d511f..452b384caa2 100644
--- a/ansible/configs/sap-integration/files/k8s/camelk_subscription.j2
+++ b/ansible/configs/sap-integration/files/k8s/camelk_subscription.j2
@@ -11,4 +11,4 @@ spec:
   name: camel-k
   source: community-operators-snapshot-christina
   sourceNamespace: openshift-marketplace
-  startingCSV: camel-k-operator.v1.3.1
\ No newline at end of file
+  startingCSV: camel-k-operator.v1.4.0
\ No newline at end of file
diff --git a/ansible/configs/sap-smart/default_vars.yml b/ansible/configs/sap-smart/default_vars.yml
index 791fa799925..1edffec7220 100644
--- a/ansible/configs/sap-smart/default_vars.yml
+++ b/ansible/configs/sap-smart/default_vars.yml
@@ -2,6 +2,8 @@
 rhel8_repos:
    - "rhel-8-for-x86_64-baseos-rpms"
    - "rhel-8-for-x86_64-appstream-rpms"
+   - "rhel-8-for-x86_64-sap-netweaver-beta-rpms"
+   - "rhel-8-for-x86_64-sap-solutions-beta-rpms"
    - "ansible-2-for-rhel-8-x86_64-rpms"
 
 rhel7_repos:
diff --git a/ansible/configs/sap-smart/sat_workload.yml b/ansible/configs/sap-smart/sat_workload.yml
index ddee64071d1..62b9aa7bc28 100644
--- a/ansible/configs/sap-smart/sat_workload.yml
+++ b/ansible/configs/sap-smart/sat_workload.yml
@@ -24,12 +24,6 @@
       --foreman-proxy-tftp true \
       --enable-foreman-plugin-discovery
 
-- name: Prevent Satellite to connect to access.redhat.com
-  lineinfile:
-    path: /etc/hosts
-    line: 127.0.0.1 access.redhat.com
-    create: yes
-
 - name: Get satellite-manifest.zip
   when: sap_smart_satellite_manifest_path is undefined
   block:
@@ -128,6 +122,12 @@
   with_items:
     - "{{ repoids.stdout.split('\n') }}"
 
+- name: Prevent Satellite to connect to access.redhat.com
+  lineinfile:
+    path: /etc/hosts
+    line: 127.0.0.1 access.redhat.com
+    create: yes
+
 - name: "Create activation key"
   command: > 
     hammer