From 564134b580767c2e81a51e6d784983ade9dcbd22 Mon Sep 17 00:00:00 2001
From: Noelia <nalentor@redhat.com>
Date: Wed, 28 Nov 2018 13:26:10 +0100
Subject: [PATCH] Merge pull request #291 from honghuac/development
---
ansible/roles/ocp-workload-fuse-ignite/defaults/main.yml | 10 +++++-----
ansible/roles/ocp-workload-fuse-ignite/tasks/workload.yml | 30 +++++++++++++++++-------------
ansible/roles/ocp-workload-fuse-ignite/tasks/remove_workload.yml | 5 -----
3 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/ansible/roles/ocp-workload-fuse-ignite/defaults/main.yml b/ansible/roles/ocp-workload-fuse-ignite/defaults/main.yml
index 712f0ec..000ee58 100644
--- a/ansible/roles/ocp-workload-fuse-ignite/defaults/main.yml
+++ b/ansible/roles/ocp-workload-fuse-ignite/defaults/main.yml
@@ -34,7 +34,7 @@
PROMETHEUS_MEMORY_LIMIT: 255Mi
META_MEMORY_LIMIT: 1Gi
SERVER_MEMORY_LIMIT: 2Gi
-MAX_INTEGRATIONS_PER_USER: 5
+MAX_INTEGRATIONS_PER_USER: 25
# userId / password for AMQ used in syndesisio
mq_username: amq
@@ -64,17 +64,17 @@
########## supported fuse ignite #################
SYNDESIS_REGISTRY: registry.access.redhat.com
SYNDESIS_REGISTRY_WEB_SUBCONTEXT: fuse7
-product_name: fuse-ignite
+product_name: fuse-ignite-1.4
# Corresponds to GPTE fork of community syndesis master branch
# This branch implements the following:
# 1) DCs in a paused state
ignite_template_name: "{{ product_name }}"
-syndesisio_url: https://raw.githubusercontent.com/gpe-mw-training/fuse-online-install/1.3.x
+syndesisio_url: https://raw.githubusercontent.com/gpe-mw-training/fuse-online-install/1.4.8
-fuse_ignite_is_yaml: "{{syndesisio_url}}/resources/fuse-ignite-image-streams.yml"
+fuse_ignite_is_yaml: "{{syndesisio_url}}/resources/fuse-online-image-streams.yml"
syndesisio_sa_yml: "{{syndesisio_url}}/resources/serviceaccount-as-oauthclient-restricted.yml"
-syndesisio_template_yml: "{{syndesisio_url}}/resources/fuse-ignite-ocp.yml"
+syndesisio_template_yml: "{{syndesisio_url}}/resources/fuse-online-template.yml"
#################################################################
diff --git a/ansible/roles/ocp-workload-fuse-ignite/tasks/remove_workload.yml b/ansible/roles/ocp-workload-fuse-ignite/tasks/remove_workload.yml
index 987f0ee..a6c9182 100644
--- a/ansible/roles/ocp-workload-fuse-ignite/tasks/remove_workload.yml
+++ b/ansible/roles/ocp-workload-fuse-ignite/tasks/remove_workload.yml
@@ -7,13 +7,8 @@
shell: oc delete clusterresourcequota clusterquota-{{ocp_username}}-{{guid}}
ignore_errors: true
-- name: Remove user Quota - oc delete clusterresourcequota "clusterquota-{{ocp_username}}"
- shell: oc delete clusterresourcequota clusterquota-{{ocp_username}}
- ignore_errors: true
-
- name: Remove user Project
shell: "oc delete project {{ocp_project}}"
-
- name: post_workload Tasks Complete
debug:
diff --git a/ansible/roles/ocp-workload-fuse-ignite/tasks/workload.yml b/ansible/roles/ocp-workload-fuse-ignite/tasks/workload.yml
index dcf2aa6..e3432df 100644
--- a/ansible/roles/ocp-workload-fuse-ignite/tasks/workload.yml
+++ b/ansible/roles/ocp-workload-fuse-ignite/tasks/workload.yml
@@ -6,7 +6,8 @@
ignore_errors: true
changed_when: false
-- fail:
+- name: user granted access rights
+ fail:
msg: "User does not have cluster-admin rights to install Fuse Online"
when: default_project_result is failed
@@ -57,14 +58,25 @@
-p IMAGE_STREAM_NAMESPACE={{ocp_project}} \
-n {{ocp_project}}
-- name: resume syndesis oauthproxy and db
- shell: oc rollout resume dc/syndesis-oauthproxy dc/syndesis-db -n {{ocp_project}}
+- name: "Resume {{with_items}}"
+ command: oc rollout resume dc/"{{ item }}" -n "{{ ocp_project }}"
+ with_items:
+ - syndesis-db
+ - syndesis-oauthproxy
+
+- include_tasks: wait_for_deploy.yml
+ vars:
+ pod_to_wait:
+ - syndesis-db
+ - syndesis-oauthproxy
+
+- name: resume todo
+ shell: oc rollout resume dc/todo -n {{ocp_project}}
- include_tasks: ./wait_for_deploy.yml
static: no
vars:
pod_to_wait:
- - syndesis-oauthproxy
- - syndesis-db
+ - todo
- name: Scale up broker-amq
shell: |
@@ -108,14 +120,6 @@
vars:
pod_to_wait:
- syndesis-prometheus
-
-- name: resume todo
- shell: oc rollout resume dc/todo -n {{ocp_project}}
-- include_tasks: ./wait_for_deploy.yml
- static: no
- vars:
- pod_to_wait:
- - todo
# ########################################################
--
Gitblit v1.9.3