separate passwords

docs/_workshop.yml

@@ -8,8 +8,10 @@ vars:
   CONSOLE_URL:
   CHE_URL:
   KEYCLOAK_URL:
-  USER_NAME: userNN
-  USER_PASSWORD: passNN
+  CHE_USER_NAME: userNN
+  CHE_USER_PASSWORD: passNN
+  OPENSHIFT_USER_NAME: userNN
+  OPENSHIFT_USER_PASSWORD: passNN
 
 modules:
   activate:

docs/deploy.adoc

@@ -22,8 +22,8 @@ oc login https://$KUBERNETES_SERVICE_HOST:$KUBERNETES_SERVICE_PORT --insecure-sk
 
 Enter your username and password assigned to you:
 
-* Username: **`{{ USER_NAME }}`**
-* Password: **`{{ USER_PASSWORD }}`**
+* Username: **`{{ OPENSHIFT_USER_NAME }}`**
+* Password: **`{{ OPENSHIFT_USER_PASSWORD }}`**
 
 [WARNING]
 ====
@@ -36,9 +36,9 @@ You should see:
 ----
 Login successful.
 
-You have one project on this server: "{{ USER_NAME }}-project"
+You have one project on this server: "{{ OPENSHIFT_USER_NAME }}-project"
 
-Using project "{{ USER_NAME }}-project".
+Using project "{{ OPENSHIFT_USER_NAME }}-project".
 Welcome! See 'oc help' to get started.
 ----
 
@@ -54,7 +54,7 @@ are a top level concept to help you organize your deployments and teams of devel
 namespace allows a community of users (or a user) to organize and manage
 their content in isolation from other communities. OpenShift _projects_ provide additional functionality for managing Kubernetes namespaces.
 
-For this scenario, a project has been created for you called `{{ USER_NAME }}-project`. You will use this project to deploy your developed project in the next step.
+For this scenario, a project has been created for you called `{{ OPENSHIFT_USER_NAME }}-project`. You will use this project to deploy your developed project in the next step.
 
 == Deploy to OpenShift
 
@@ -127,11 +127,11 @@ hello quarkus-on-openshift from people-1-9sgsm
 Your hostname (the Kubernetes _pod_ in which your app runs) name will be different from the above.
 ====
 
-So now our app is deployed to OpenShift. You can also see it in the {{ CONSOLE_URL}}[OpenShift Console,window=_blank]. Login with your assigned username and password (e.g. `{{ USER_NAME }}/{{ USER_PASSWORD }}`):
+So now our app is deployed to OpenShift. You can also see it in the {{ CONSOLE_URL}}[OpenShift Console,window=_blank]. Login with your assigned username and password (e.g. `{{ OPENSHIFT_USER_NAME }}/{{ OPENSHIFT_USER_PASSWORD }}`):
 
 image::ocplogin.png[login,600]
 
-Once logged in, click on the name of your project ({{ USER_NAME }}-project_):
+Once logged in, click on the name of your project ({{ OPENSHIFT_USER_NAME }}-project_):
 
 image::ocpproj.png[project,600]
 

docs/intro.adoc

@@ -34,7 +34,7 @@ echo "This is a bash shell command that you can copy/paste by clicking"
 
 You will be using Red Hat CodeReady Workspaces, an online IDE based on https://www.eclipse.org/che/[Eclipe Che,window=_blank]. **Changes to files are auto-saved every few seconds**, so you don't need to explicitly save changes.
 
-To get started, {{ CHE_URL }}[access the Che instance,window=_blank] and log in using the username and password you've been assigned (e.g. `{{ USER_NAME }}/{{ USER_PASSWORD }}`):
+To get started, {{ CHE_URL }}[access the Che instance,window=_blank] and log in using the username and password you've been assigned (e.g. `{{ CHE_USER_NAME }}/{{ CHE_USER_PASSWORD }}`):
 
 image::che-login.png[login,400]
 

docs/kafka.adoc

@@ -38,7 +38,7 @@ image::names.png[names,800]
 
 The Strimzi operator installs and manages Kafka clusters on Kubernetes. It's been pre-installed for you, so all you have to do is create a Kafka cluster inside your namespace.
 
-First, open the {{CONSOLE_URL}}[OpenShift Console], log in using your username/password if needed (e.g. `{{ USER_NAME }}`/`{{ USER_PASSWORD }}`) and navigate to your project (`{{ USER_NAME }}-project`). Once there, on the left menu click on _Catalog > Developer Catalog_ and type in `kafka` in the keyword filter box:
+First, open the {{CONSOLE_URL}}[OpenShift Console], log in using your username/password if needed (e.g. `{{ OPENSHIFT_USER_NAME }}`/`{{ OPENSHIFT_USER_PASSWORD }}`) and navigate to your project (`{{ OPENSHIFT_USER_NAME }}-project`). Once there, on the left menu click on _Catalog > Developer Catalog_ and type in `kafka` in the keyword filter box:
 
 image::kafkacatalog.png[kafkacatalog,800]
 

setup/preparelab.sh

@@ -109,8 +109,10 @@ oc new-app quay.io/osevg/workshopper --name=web \
       -e ROUTE_SUBDOMAIN=${HOSTNAME_SUFFIX} \
       -e CONTENT_URL_PREFIX="https://raw.githubusercontent.com/RedHatWorkshops/quarkus-workshop/master/docs/" \
       -e WORKSHOPS_URLS="https://raw.githubusercontent.com/RedHatWorkshops/quarkus-workshop/master/docs/_workshop.yml" \
-      -e USER_NAME=userNN \
-      -e USER_PASSWORD=passNN \
+      -e CHE_USER_NAME=userNN \
+      -e CHE_USER_PASSWORD=passNN \
+      -e OPENSHIFT_USER_NAME=userNN \
+      -e OPENSHIFT_USER_PASSWORD=passNN \
       -e LOG_TO_STDOUT=true
 oc expose svc/web