From 6fd6b979a60a0b59af591b53a66c35a99d388eda Mon Sep 17 00:00:00 2001
From: Pablo Navascues Jimenez <kaspaspam@gmail.com>
Date: Mon, 09 Sep 2019 14:02:33 +0200
Subject: [PATCH] Ocp4 workload camelk lab (#692)
---
ansible/roles/ocp4-workload-camelk-lab/tasks/workload.yml | 20 +++++++++++---------
ansible/roles/ocp4-workload-camelk-lab/templates/installed-community-openshift-operators.yml | 2 +-
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/ansible/roles/ocp4-workload-camelk-lab/tasks/workload.yml b/ansible/roles/ocp4-workload-camelk-lab/tasks/workload.yml
index ba7da6f..b10babf 100644
--- a/ansible/roles/ocp4-workload-camelk-lab/tasks/workload.yml
+++ b/ansible/roles/ocp4-workload-camelk-lab/tasks/workload.yml
@@ -142,17 +142,18 @@
# namespace: openshift-operators
# register: camelk_sub_exists
-- name: Red Hat CSC deployment
- shell: oc apply -f {{role_path}}/templates/installed-redhat-openshift-operators.yml -n openshift-marketplace
-- name: Community CSC deployment
- shell: oc apply -f {{role_path}}/templates/installed-community-openshift-operators.yml -n openshift-marketplace
+#- name: Red Hat CSC deployment
+# shell: oc apply -f {{role_path}}/templates/installed-redhat-openshift-operators.yml -n openshift-marketplace
-- name: CamelK subscription deployment
- shell: oc apply -f {{role_path}}/templates/camelk-subscription.yml -n openshift-operators
+#- name: Community CSC deployment
+# shell: oc apply -f {{role_path}}/templates/installed-community-openshift-operators.yml -n openshift-marketplace
-- name: AMQ Streams subscription deployment
- shell: oc apply -f {{role_path}}/templates/amqstreams-subscription.yml -n openshift-operators
+#- name: CamelK subscription deployment
+# shell: oc apply -f {{role_path}}/templates/camelk-subscription.yml -n openshift-operators
+
+#- name: AMQ Streams subscription deployment
+# shell: oc apply -f {{role_path}}/templates/amqstreams-subscription.yml -n openshift-operators
##############################
## CURRENCY ##
@@ -267,4 +268,5 @@
# - name: workload tasks complete
# debug:
# msg: "Workload Tasks completed successfully."
-# when: not silent|bool
\ No newline at end of file
+
+# when: not silent|bool
diff --git a/ansible/roles/ocp4-workload-camelk-lab/templates/installed-community-openshift-operators.yml b/ansible/roles/ocp4-workload-camelk-lab/templates/installed-community-openshift-operators.yml
index e8daef1..49e6b8a 100644
--- a/ansible/roles/ocp4-workload-camelk-lab/templates/installed-community-openshift-operators.yml
+++ b/ansible/roles/ocp4-workload-camelk-lab/templates/installed-community-openshift-operators.yml
@@ -12,6 +12,6 @@
"csDisplayName": "Community Operators",
"csPublisher": "Community",
"packages": "camel-k",
- "targetNamespace": "openshift-operators"
+ "targetNamespace": "openshift-marketplace"
}
}
--
Gitblit v1.9.3