Revert "dil1 branch"

docs/labs/citizen-integrator-track/lab01/README.md

@@ -36,7 +36,7 @@ Please ask your instructor for your password.
 If you haven't done so already, you need to login to the **Red Hat Solution Explorer** webpage so that a unique lab environment can be provisioned on-demand for your exclusive use.  You should open a web browser and navigate to: 
 
 ```bash
-https://tutorial-web-app-webapp.dil1.opentry.me
+https://tutorial-web-app-webapp.dil.opentry.me
 ```
 
 You will be presented with a login page where you can enter your unique credentials:
@@ -58,7 +58,7 @@ Once the environment is provisioned, you will be presented with a page that pres
 1. Open a browser window and navigate to:
 
     ```bash
-    http://apicurio-studio.dil1.opentry.me
+    http://apicurio-studio.dil.opentry.me
     ```
 
 1. Log in using your designated [user and password](#environment).

docs/labs/citizen-integrator-track/lab02/README.md

@@ -36,7 +36,7 @@ Please ask your instructor for your password.
 If you haven't done so already, you need to login to the **Red Hat Solution Explorer** webpage so that a unique lab environment can be provisioned on-demand for your exclusive use.  You should open a web browser and navigate to: 
 
 ```bash
-https://tutorial-web-app-webapp.dil1.opentry.me
+https://tutorial-web-app-webapp.dil.opentry.me
 ```
 
 You will be presented with a login page where you can enter your unique credentials:
@@ -58,7 +58,7 @@ Once the environment is provisioned, you will be presented with a page that pres
 1. Open a browser window and navigate to:
 
     ```bash
-    http://microcks.dil1.opentry.me
+    http://microcks.dil.opentry.me
     ```
 
 1. Log in into Microks using your designated [user and password](#environment).
@@ -109,7 +109,7 @@ We now have a working REST mock service listening for requests. We will use an o
 1. Enter the copied URL from **Step 9**. It should look like this:
 
     ```bash
-    http://microcks.dil1.opentry.me/rest/Locations-User1/1.0.0/locations
+    http://microcks.dil.opentry.me/rest/Locations-User1/1.0.0/locations
     ```
 
 1. Click the **START YOUR CURL** button.

docs/labs/citizen-integrator-track/lab03/README.md

@@ -31,7 +31,7 @@ Please ask your instructor for your password.
 If you haven't done so already, you need to login to the **Red Hat Solution Explorer** webpage so that a unique lab environment can be provisioned on-demand for your exclusive use.  You should open a web browser and navigate to: 
 
 ```bash
-https://tutorial-web-app-webapp.dil1.opentry.me
+https://tutorial-web-app-webapp.dil.opentry.me
 ```
 
 You will be presented with a login page where you can enter your unique credentials:
@@ -185,7 +185,7 @@ We will use an online cURL tool to create your own record field in database.
 
   **REQUEST**
   ```
-   http://location-service-international.dil1.opentry.me/locations/101
+   http://location-service-international.dil.opentry.me/locations/101
 
   ```
 

docs/labs/citizen-integrator-track/lab04/README.md

@@ -20,7 +20,7 @@ Red Hat provides one the leading API Management tools that provides API manageme
 If you are planning to skip to the next lab, there is an already running API proxy for the Location API Service in this endpoint:
 
 ```bash
-https://location-service-api.amp.dil1.opentry.me
+https://location-service-api.amp.dil.opentry.me
 ```
 
 ### Environment
@@ -40,7 +40,7 @@ Please ask your instructor for your password.
 If you haven't done so already, you need to login to the **Red Hat Solution Explorer** webpage so that a unique lab environment can be provisioned on-demand for your exclusive use. You should open a web browser and navigate to: 
 
 ```bash
-https://tutorial-web-app-webapp.dil1.opentry.me
+https://tutorial-web-app-webapp.dil.opentry.me
 ```
 
 You will be presented with a login page where you can enter your unique credentials:
@@ -64,7 +64,7 @@ Your 3scale Admin Portal provides access to a number of configuration features.
 1. Click on the `3scale Admin Dashboard` from the Red Hat Solution Explorer. The URL should look like
 
     ```bash
-    https://userX-admin.dil1.opentry.me/p/login
+    https://userX-admin.dil.opentry.me/p/login
     ```
 
     *Remember the `X` variable in the URL with your assigned user number.*
@@ -203,9 +203,9 @@ The order in which the policies are executed, known as the “policy chain”, c
 
     * Private Base URL: **http://location-service.international.svc:8080**
 
-    * Staging Public Base URL: **https://location-userX-api-staging.amp.dil1.opentry.me:443**
+    * Staging Public Base URL: **https://location-userX-api-staging.amp.dil.opentry.me:443**
 
-    * Production Public Base URL: **https://location-userX-api.amp.dil1.opentry.me:443**
+    * Production Public Base URL: **https://location-userX-api.amp.dil.opentry.me:443**
 
     *Remember to replace the X with your user number*.
 

docs/labs/citizen-integrator-track/lab05/README.md

@@ -20,7 +20,7 @@ The Red Hat SSO product provides important functionality for managing identities
 If you are planning to skip to the next lab, there is an already running OpenID Connect secured API proxy for the Location API Service in this endpoint:
 
 ```bash
-https://location-sso.amp.dil1.opentry.me:443
+https://location-sso.amp.dil.opentry.me:443
 ```
 
 ### Environment
@@ -40,7 +40,7 @@ Please ask your instructor for your password.
 If you haven't done so already, you need to login to the **Red Hat Solution Explorer** webpage so that a unique lab environment can be provisioned on-demand for your exclusive use.  You should open a web browser and navigate to: 
 
 ```bash
-https://tutorial-web-app-webapp.dil1.opentry.me
+https://tutorial-web-app-webapp.dil.opentry.me
 ```
 
 You will be presented with a login page where you can enter your unique credentials:
@@ -62,7 +62,7 @@ Once the environment is provisioned, you will be presented with a page that pres
 1. Open a browser window and navigate to:
 
     ```bash
-    https://secure-sso-sso.dil1.opentry.me/auth/admin/userX/console
+    https://secure-sso-sso.dil.opentry.me/auth/admin/userX/console
     ```
 
     *Remember to replace the `X` variable in the URL with your assigned user number.*
@@ -122,7 +122,7 @@ Once the environment is provisioned, you will be presented with a page that pres
 1. Open a browser window and navigate to:
 
     ```bash
-    https://userX-admin.dil1.opentry.me/p/login
+    https://userX-admin.dil.opentry.me/p/login
     ```
 
     *Remember to replace the X with your user number.*
@@ -166,7 +166,7 @@ Once the environment is provisioned, you will be presented with a page that pres
 1. In the **OpenID Connect Issuer** field, type in your previously noted client credentials with the URL of your Red Hat Single Sing On instance:
 
     ```bash
-    http://3scale-admin:CLIENT_SECRET@sso-sso.dil1.opentry.me/auth/realms/userX
+    http://3scale-admin:CLIENT_SECRET@sso-sso.dil.opentry.me/auth/realms/userX
     ```
 
     *Remember to replace the X with user number*
@@ -210,7 +210,7 @@ Once the environment is provisioned, you will be presented with a page that pres
 
     ![13-create-app.png](images/13-create-app.png "Create App")
 
-1. Update the **Redirect URL** to http://www-userX.dil1.opentry.me/*. And note the *API Credentials*. Write them down as you will need the **Client ID** and the **Client Secret** to test your integration. 
+1. Update the **Redirect URL** to http://www-userX.dil.opentry.me/*. And note the *API Credentials*. Write them down as you will need the **Client ID** and the **Client Secret** to test your integration. 
     ![14-app-credentials.png](images/14-app-credentials.png "App Credentials")
 
 *Congratulations!* You have now an application to test your OpenID Connect Integration.

docs/labs/citizen-integrator-track/lab06/README.md

@@ -34,7 +34,7 @@ Please ask your instructor for your password.
 If you haven't done so already, you need to login to the **Red Hat Solution Explorer** webpage so that a unique lab environment can be provisioned on-demand for your exclusive use.  You should open a web browser and navigate to: 
 
 ```bash
-https://tutorial-web-app-webapp.dil1.opentry.me
+https://tutorial-web-app-webapp.dil.opentry.me
 ```
 
 You will be presented with a login page where you can enter your unique credentials:
@@ -56,7 +56,7 @@ Once the environment is provisioned, you will be presented with a page that pres
 1. Click on the `3scale Admin Dashboard` from the Red Hat Solution Explorer. The URL should look like
 
     ```bash
-    https://userX-admin.dil1.opentry.me/p/login
+    https://userX-admin.dil.opentry.me/p/login
     ```
 
     *Remember the `X` variable in the URL is your assigned user number.*
@@ -142,7 +142,7 @@ Once the environment is provisioned, you will be presented with a page that pres
 1. Open a new *Incognito/Private* browser window to test the Developer Portal login. Navigate to:
 
     ```bash
-    https://userX.dil1.opentry.me/
+    https://userX.dil.opentry.me/
     ```
 
 1. Type your portal code to finish the login.

docs/labs/citizen-integrator-track/lab06/support/homepage.example

@@ -188,7 +188,7 @@
     <div class="row">
 
       <div class="col-md-12">
-        <h4><code style="display:block">$ curl -k -v "https://location-api.amp.dil1.opentry.me:443/locations"</code></h4>
+        <h4><code style="display:block">$ curl -k -v "https://location-api.amp.dil.opentry.me:443/locations"</code></h4>
         <br/>
         <div class="row">
           <div class="col-md-6">

docs/labs/citizen-integrator-track/lab07/README.md

@@ -20,7 +20,7 @@ Applications can be built from many technologies. In this case we use a simple w
 If you decide to skip the lab you can check how a SSO enabled web applications looks like:
 
 ```bash
-http://www-international.dil1.opentry.me/
+http://www-international.dil.opentry.me/
 ```
 
 ### Environment
@@ -40,7 +40,7 @@ Please ask your instructor for your password.
 If you haven't done so already, you need to login to the **Red Hat Solution Explorer** webpage so that a unique lab environment can be provisioned on-demand for your exclusive use.  You should open a web browser and navigate to: 
 
 ```bash
-https://tutorial-web-app-webapp.dil1.opentry.me
+https://tutorial-web-app-webapp.dil.opentry.me
 ```
 
 You will be presented with a login page where you can enter your unique credentials:
@@ -94,7 +94,7 @@ Redirect URLs are a critical part of the OAuth flow. After a user successfully a
 1. Open a browser window and navigate to:
 
     ```bash
-    http://sso-sso.dil1.opentry.me/auth/admin/userX/console/
+    http://sso-sso.dil.opentry.me/auth/admin/userX/console/
     ```
 
     *Remember to replace the X with your user number.*
@@ -122,7 +122,7 @@ Redirect URLs are a critical part of the OAuth flow. After a user successfully a
     | Access Type | Public |
     | Standard Flow Enabled | ON |
     | Implicit Flow Enabled | OFF |
-    | Valid Redirect URIs | http://www-userX.dil1.opentry.me/* |
+    | Valid Redirect URIs | http://www-userX.dil.opentry.me/* |
     | Web Origins | \* |
 
     *Remember to replace the X with your user number.*
@@ -135,7 +135,7 @@ Redirect URLs are a critical part of the OAuth flow. After a user successfully a
 
 International Inc web development create a Node.js application for the company home page. They added a map service to locate the offices around the world. In this step you will deploy that application.
 
-1. Open a browser tab and navigate to `http://www-userX.dil1.opentry.me`.
+1. Open a browser tab and navigate to `http://www-userX.dil.opentry.me`.
 
 *Remember to replace the `X` variable in the URL with your assigned user number.*
 
@@ -175,7 +175,7 @@ International Inc web development create a Node.js application for the company h
 
 1. In the developer console, a red error should appear indicating a cert issue. Click on the link and accept the certificate. 
 
-*Example link: `https://location-userX-api-staging.amp.dil1.opentry.me/locations`*
+*Example link: `https://location-userX-api-staging.amp.dil.opentry.me/locations`*
 
 1. Refresh the page, and the locations should appear.
 

docs/labs/developer-track/lab01/README.md

@@ -38,7 +38,7 @@ Please ask your instructor for your password.
 If you haven't done so already, you need to login to the **Red Hat Solution Explorer** webpage so that a unique lab environment can be provisioned on-demand for your exclusive use.  You should open a web browser and navigate to: 
 
 ```bash
-https://tutorial-web-app-webapp.dil1.opentry.me
+https://tutorial-web-app-webapp.dil.opentry.me
 ```
 
 You will be presented with a login page where you can enter your unique credentials:
@@ -60,7 +60,7 @@ Once the environment is provisioned, you will be presented with a page that pres
 1. Open a browser window and navigate to:
 
     ```bash
-    http://apicurio-studio.dil1.opentry.me
+    http://apicurio-studio.dil.opentry.me
     ```
 
 1. Log in using your designated [user and password](#environment).

docs/labs/developer-track/lab02/README.md

@@ -36,7 +36,7 @@ Please ask your instructor for your password.
 If you haven't done so already, you need to login to the **Red Hat Solution Explorer** webpage so that a unique lab environment can be provisioned on-demand for your exclusive use.  You should open a web browser and navigate to: 
 
 ```bash
-https://tutorial-web-app-webapp.dil1.opentry.me
+https://tutorial-web-app-webapp.dil.opentry.me
 ```
 
 You will be presented with a login page where you can enter your unique credentials:
@@ -62,7 +62,7 @@ Follow this instructions to set up the repository.
 1. Open a browser window and navigate to:
 
     ```bash
-    http://gogs.dil1.opentry.me/
+    http://gogs.dil.opentry.me/
     ```
 
 1. Log into Gogs using your designated [user and password](#environment). Click on **Sign In**.
@@ -110,7 +110,7 @@ Follow this instructions to set up the repository.
 1. Copy the browser tab URL. Store that URL address as you will use it in the next steps of the lab. The URL should look like the following:
 
     ```bash
-     http://gogs.dil1.opentry.me/userX/locations-api/raw/dev-track-lab-02/locations-api/Locations-UserX.json
+     http://gogs.dil.opentry.me/userX/locations-api/raw/dev-track-lab-02/locations-api/Locations-UserX.json
     ```
 
     *If you feel more comfortable, you can also copy and paste the RAW button link from the previous step.  Also, don't forget to update the X variable with your user number*.
@@ -120,7 +120,7 @@ Follow this instructions to set up the repository.
 1. Open a browser window and navigate to:
 
     ```bash
-    http://microcks.dil1.opentry.me/
+    http://microcks.dil.opentry.me/
     ```
 
 1. Log in into Microcks using your designated [user and password](#environment).
@@ -138,7 +138,7 @@ Follow this instructions to set up the repository.
 1. In the `Create a New Job` dialog, type in the following information replacing **X** with your user number. Click **Next**.
 
     * Name: **Locations-UserX**
-    * Repository URL: **http://gogs.dil1.opentry.me/userX/locations-api/raw/dev-track-lab-02/locations-api/Locations-UserX.json**
+    * Repository URL: **http://gogs.dil.opentry.me/userX/locations-api/raw/dev-track-lab-02/locations-api/Locations-UserX.json**
 
     *You can also copy and paste the raw url you saved from the Gogs repository (Step 0)*.
 
@@ -194,7 +194,7 @@ We now have a working REST mock service listening for requests. We will use an o
    *Remember to replace X with your user number*.
 
     ```bash
-    http://microcks.dil1.opentry.me/rest/Locations-UserX/1.0.0/locations
+    http://microcks.dil.opentry.me/rest/Locations-UserX/1.0.0/locations
     ```
 
 1. Click the **START YOUR CURL** button.

docs/labs/developer-track/lab03/README.md

@@ -36,7 +36,7 @@ Please ask your instructor for your password.
 If you haven't done so already, you need to login to the **Red Hat Solution Explorer** webpage so that a unique lab environment can be provisioned on-demand for your exclusive use.  You should open a web browser and navigate to: 
 
 ```bash
-https://tutorial-web-app-webapp.dil1.opentry.me
+https://tutorial-web-app-webapp.dil.opentry.me
 ```
 
 You will be presented with a login page where you can enter your unique credentials:
@@ -84,7 +84,7 @@ Enter dummy values for `First Name` and `Last Name`. Click **Submit**.
 1. Open a browser window and navigate to:
 
     ```bash
-    https://dil1.opentry.me/console
+    https://dil.opentry.me/console
     ```
 
 1. Click on your unique namespace to enter your workspace e.g. `user39`.
@@ -109,7 +109,7 @@ Enter dummy values for `First Name` and `Last Name`. Click **Submit**.
 
     ![00-import-project.png](images/00-import-project.png "Import Project")
 
-1. Enter `http://gogs.dil1.opentry.me/userX/dayintheliferepo` as the git URL, making sure to update `userX` with your unique username.  Select **Import Recursively** and then click **Import**.
+1. Enter `http://gogs.dil.opentry.me/userX/dayintheliferepo` as the git URL, making sure to update `userX` with your unique username.  Select **Import Recursively** and then click **Import**.
 
 1. When the "Save" pop-up appears, click the "X" to close the pop-up.
 
@@ -350,7 +350,7 @@ Once you've received the swagger specification (API contract) from your friendly
 
     ![00-location-list.png](images/00-location-list.png "Location List")
 
-1. Now that we've tested our API service implementation locally, we can deploy it to our running OpenShift environment.  First we need to login to OpenShift via the Terminal.  Navigate back to the OpenShift web UI and click the **Copy Login Command** link.  If you aren't logged-in to OpenShift, open a new tab and navigate to `https://dil1.opentry.me/console`.
+1. Now that we've tested our API service implementation locally, we can deploy it to our running OpenShift environment.  First we need to login to OpenShift via the Terminal.  Navigate back to the OpenShift web UI and click the **Copy Login Command** link.  If you aren't logged-in to OpenShift, open a new tab and navigate to `https://dil.opentry.me/console`.
 
     ![00-location-list.png](images/00-login-ocp-cli.png "OCP CLI Login")
 
@@ -376,7 +376,7 @@ Once you've received the swagger specification (API contract) from your friendly
 1. Lastly, via the Eclipse Che terminal, test the HTTP POST using curl.  You can use the following command:
 
     ```bash
-	curl --header "Content-Type: application/json" --request POST --data '{"id": 101,"name": "Kakadu","type": "HQ","status": "1","location": {"lat": "78.88436","lng": "99.05295"}}' http://location-service-OCPPROJECT.dil1.opentry.me/locations
+	curl --header "Content-Type: application/json" --request POST --data '{"id": 101,"name": "Kakadu","type": "HQ","status": "1","location": {"lat": "78.88436","lng": "99.05295"}}' http://location-service-OCPPROJECT.dil.opentry.me/locations
     ```
 
     Remember to replace OCPPROJECT with your username.