From 403d753ae0dd467d935af684112f457f51da6ad0 Mon Sep 17 00:00:00 2001 From: Patrick T. Rutledge III <rut31337@users.noreply.github.com> Date: Thu, 01 Nov 2018 13:42:08 +0100 Subject: [PATCH] Merge pull request #269 from honghuac/development --- ansible/roles/ocp-workload-fuse-ignite/defaults/main.yml | 6 +++--- ansible/roles/ocp-workload-fuse-ignite/readme.adoc | 46 +++++++++++++++++++++++++++------------------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/ansible/roles/ocp-workload-fuse-ignite/defaults/main.yml b/ansible/roles/ocp-workload-fuse-ignite/defaults/main.yml index 9ab644c..9a94cdb 100644 --- a/ansible/roles/ocp-workload-fuse-ignite/defaults/main.yml +++ b/ansible/roles/ocp-workload-fuse-ignite/defaults/main.yml @@ -42,7 +42,7 @@ ########## community syndesis ################# -#SYNDESIS_REGISTRY: docker.io +#SYNDESIS_REGISTRY: docker.io #SYNDESIS_REGISTRY_WEB_SUBCONTEXT: syndesis #SYNDESIS_TAG: 1.3.10 #product_name: syndesis @@ -62,7 +62,7 @@ ########## supported fuse ignite ################# -SYNDESIS_REGISTRY: registry.access.redhat.com +SYNDESIS_REGISTRY: registry.access.redhat.com SYNDESIS_REGISTRY_WEB_SUBCONTEXT: fuse7 product_name: fuse-ignite @@ -70,7 +70,7 @@ # 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-ignite-install/gpte-1.3 +syndesisio_url: https://raw.githubusercontent.com/gpe-mw-training/fuse-online-install/gpte-1.3 fuse_ignite_is_yaml: "{{syndesisio_url}}/resources/fuse-ignite-image-streams.yml" syndesisio_sa_yml: "{{syndesisio_url}}/resources/serviceaccount-as-oauthclient-restricted.yml" diff --git a/ansible/roles/ocp-workload-fuse-ignite/readme.adoc b/ansible/roles/ocp-workload-fuse-ignite/readme.adoc index 21e3935..9a87033 100644 --- a/ansible/roles/ocp-workload-fuse-ignite/readme.adoc +++ b/ansible/roles/ocp-workload-fuse-ignite/readme.adoc @@ -1,28 +1,36 @@ -= ocp-workload-developer-environment - Sample Config += ocp-workload-fuse-ignite +Execute these commands with these env variables ----- +== Execution using oc client against remote host + +HOST_GUID=na311 +TARGET_HOST="bastion.$HOST_GUID.openshift.opentlc.com" WORKLOAD="ocp-workload-fuse-ignite" -HOST_GUID=dev39 +SSH_USERNAME="hchin-redhat.com" +SSH_PRIVATE_KEY="id_ocp" GUID=adm0 +OCP_USERNAME="developer" +HOST_GUID=na311 POSTGRESQL_MEMORY_LIMIT=512Mi PROMETHEUS_MEMORY_LIMIT=255Mi META_MEMORY_LIMIT=1Gi SERVER_MEMORY_LIMIT=2Gi -ansible-playbook -i localhost, -c local ./configs/ocp-workloads/ocp-workload.yml \ - -e"ANSIBLE_REPO_PATH=`pwd`" \ - -e"ocp_workload=${WORKLOAD}" \ - -e"ocp_user_needs_quota=true" \ - -e"guid=$GUID" \ - -e"POSTGRESQL_MEMORY_LIMIT=$POSTGRESQL_MEMORY_LIMIT" \ - -e"PROMETHEUS_MEMORY_LIMIT=$PROMETHEUS_MEMORY_LIMIT" \ - -e"META_MEMORY_LIMIT=$META_MEMORY_LIMIT" \ - -e"SERVER_MEMORY_LIMIT=$SERVER_MEMORY_LIMIT" \ - -e"ACTION=create" -ansible-playbook -i localhost, -c local ./configs/ocp-workloads/ocp-workload.yml \ - -e"ANSIBLE_REPO_PATH=`pwd`" \ - -e"ocp_workload=${WORKLOAD}" \ - -e"guid=$GUID" \ - -e"ACTION=remove" ----- +----- + +ansible-playbook -i ${TARGET_HOST}, -c local ./configs/ocp-workloads/ocp-workload.yml \ + -e "ANSIBLE_REPO_PATH=`pwd`" \ + -e "ocp_username=${OCP_USERNAME}" \ + -e "ocp_workload=${WORKLOAD}" \ + -e "guid=${GUID}" \ + -e "subdomain_base=${HOST_GUID}.openshift.opentlc.com" \ + -e "ACTION=create" + +ansible-playbook -i ${TARGET_HOST}, -c local ./configs/ocp-workloads/ocp-workload.yml \ + -e "ANSIBLE_REPO_PATH=`pwd`" \ + -e "ocp_username=${OCP_USERNAME}" \ + -e "ocp_workload=${WORKLOAD}" \ + -e "guid=${GUID}" \ + -e "ACTION=remove" +----- -- Gitblit v1.9.3