From 0e7f8fe07af984e9a37202ed61ed569eb72eda0a Mon Sep 17 00:00:00 2001
From: Ravi Srinivasan <rsriniva@users.noreply.github.com>
Date: Fri, 15 Mar 2019 06:57:49 +0100
Subject: [PATCH] Merge pull request #2 from kborup-redhat/patch-2

---
 exercises/4-an-enslaved-hope/README.md |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/exercises/4-an-enslaved-hope/README.md b/exercises/4-an-enslaved-hope/README.md
index 0453f56..aa36fe5 100644
--- a/exercises/4-an-enslaved-hope/README.md
+++ b/exercises/4-an-enslaved-hope/README.md
@@ -219,6 +219,7 @@
 
 1. For the rest of the lab, ensure that you are working from the `master` branch
 ```bash
+cd todolist-fe
 git checkout master
 ```
 
@@ -233,7 +234,7 @@
 
 4. Create a new object in `inventory/group_vars/all.yml` to drive the `ocp-pipeline` template with the parameters file you've just created. It can be put under the existing `todolist-fe-build` object.
 ```yaml
-  - name: todolist-ocp-pipeline
+  - name: todolist-fe-pipeline
     template: "{{ playbook_dir }}/templates/ocp-pipeline.yml"
     params: "{{ playbook_dir }}/params/ocp-pipeline"
     namespace: "{{ ci_cd_namespace }}"
@@ -284,7 +285,7 @@
 
 10. Update the `todolist-api/.openshift-applier/inventory/group_vars/all.yml` with a new object to drive the params and template
 ```yaml
-  - name: todolist-ocp-pipeline
+  - name: todolist-api-pipeline
     template: "{{ playbook_dir }}/templates/ocp-pipeline.yml"
     params: "{{ playbook_dir }}/params/ocp-pipeline"
     namespace: "{{ ci_cd_namespace }}"
@@ -417,6 +418,23 @@
 2. Head to <CLUSTER_URL> on OpenShift and move to your ci-cd project `Builds > Images`. You should see the `jenkins-slave-arachni` image.
 ![builds-zap-arachni](../images/exercise4/builds-zap-arachni.png)
 
+3. Just like you did with the `jenkins-slave-npm`, configure the `jenkins-slave-arachni` pod template to bypass SSL certificate checks in the Jenkins global configuration settings. Log in to Jenkins and navigate to `Manage Jenkins` > `Configure System` page.
+
+4. Locate the `Kubernetes Pod Template` section by scrolling to the bottom of the page and click on `Add Pod Template` to add a new pod template for the Arachni scanner slave.
+![add-kube-pod-template](../images/exercise4/add-kube-pod-template.png)
+
+5. For the new pod template, enter `jenkins-slave-arachni` in the `Name` and `Labels` fields. 
+
+6. In the `Containers` section for the pod template, add a new container template with the following details:
+    * Enter `jnlp` in the `Name` field
+    * Enter `docker-registry.default.svc:5000/<YOUR_NAME>-ci-cd/jenkins-slave-arachni` in the `Docker image` field
+    * Enter `/tmp` in the `Working directory` field
+    * Enter `${computer.jnlpmac} ${computer.name}` in the `Arguments to pass to the command` field
+
+7. Add a new environment variable for the container template called `GIT_SSL_NO_VERIFY` and set its value to `true`. Your final `jenkins-slave-arachni` kubernetes pod template should look like the following:
+![add-kube-pod-template](../images/exercise4/new-arachni-container-template.png)
+
+8. Click `Save` at the bottom of the page to save your global Jenkins settings.
 _____
 
 <!-- ## Extension Tasks

--
Gitblit v1.9.3