Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor updates/corrections #1

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pages/10_SCM_Web_Hooks.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,10 @@ image:images/github_add_webhook.jpg[image]
* Make a copy of this line, then comment the original line 6.
* In the new copy of line 6 set its value to 'green', then save the file.

....
//$deployment = getenv("COLOR");
$deployment = 'green';

....

* Commit the file.

Expand Down
2 changes: 1 addition & 1 deletion pages/14_Creating_a_Pipeline.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Now you will be taken to Jenkins console (that is running on OpenShift).

*Step 3:* Understand the pipeline

Using left menu on the Web Console, select `Builds`->`Pipelines`. You
Using left menu on the OpenShift Web Console, select `Builds`->`Pipelines`. You
will see that `myfirstpipeline` is created. Click on that.

Since we haven't run the pipeline yet, the `History` tab shows nothing.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Open the browser and select your project *<your_project_name>*.
Click into *Add to Project->Browse Catalog* button.

In the search text box type `eap` and select the
'JBoss EAP 7.0(no https)' for this builder image.
'JBoss EAP 7.1(no https)' for this builder image.

Fill the fields with the following information:

Expand Down
6 changes: 3 additions & 3 deletions pages/5_Using_templates.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Click the "*Next*" button

On the "*Binding*" page click the *Create* button.

Naviagete back to the project overview page and soon you will see
Navigate back to the project overview page and soon you will see
an image of a running pod.

image:images/mysql_pod_on_proj_overview.png[image]
Expand Down Expand Up @@ -91,7 +91,7 @@ TIP: If you need service ip address navigate to *Applications->Services* tab on

[source,sh]
----
mysql -h127.0.0.1 -P3306 -upricelist -p
mysql -h127.0.0.1 -P3306 -u pricelist -p
----

You will be taken to the `mysql` prompt. See the list of databases. You
Expand Down Expand Up @@ -222,7 +222,7 @@ deployment is complete, the frontend pod starts running.

Prior to testing the application we need to first define some Environment Variables.

From the Project page navigate to the 'pricelist' configuration page by clicking on the 'pricelist' project.
From the Project page navigate to the 'pricelist' configuration page by clicking on the 'pricelist' deployment config.

Click on the Environment tab to see a list of environment variables.

Expand Down
2 changes: 1 addition & 1 deletion pages/7_Binary_Deployment_of_a_war_file.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ renamed to `ROOT.war` and placed in the deployments folder (you can
download this example WAR file
https://raw.githubusercontent.com/RedHatWorkshops/ps/master/deployments/ROOT.war[here]).

$ wget https://raw.githubusercontent.com/RedHatWorkshops/ps/master/deployments/ROOT.war
$ curl https://raw.githubusercontent.com/RedHatWorkshops/ps/master/deployments/ROOT.war -o ROOT.war

....
$ ls -lR
Expand Down
9 changes: 5 additions & 4 deletions pages/9_Blue_Green_Deployments.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,14 @@ $ oc new-project bluegreen-UserName --display-name="Blue Green Project" --descri


*Step 2: List existing image builder or image streams*

....
$ oc new-app -S --image-stream=php

Image streams (oc new-app --image-stream=<image-stream> [--code=<source>])
php
Project: openshift
Tags: 5.5, 5.6, latest
Tags: 7.0, 7.1, latest
....

*Step 3: Create an application*

Expand Down Expand Up @@ -214,7 +215,7 @@ application with a green rectangle.
Part III
~~~~~~~

You can route traffic to both services. This is also known as "cannary in a colemine".
You can route traffic to both services. This is also known as a "canary in a coalmine".

*Step 1: Edit Your Route*
Using the lefthand side navigation; click on *Applications -> Routes*. This will
Expand Down Expand Up @@ -269,7 +270,7 @@ concurrently, each with a unique service.
service being used by the route to publicly advertise the application.
* You can split traffic accross two services

Let's clean up the project prior to continueing.
Let's clean up the project prior to continuing.

$ oc delete project bluegreen-UserName

Expand Down
Binary file removed slides/Openshift_Workshop.pptx
Binary file not shown.