From fd433bfb5ba87f9321155c15d500f042fd4ead2f Mon Sep 17 00:00:00 2001 From: acammies <acammies@redhat.com> Date: Wed, 18 Apr 2018 12:26:10 +0200 Subject: [PATCH] rejigged some bits around to fit the new inventory style --- exercises/4-an-enslaved-hope/README.md | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/exercises/4-an-enslaved-hope/README.md b/exercises/4-an-enslaved-hope/README.md index f0c3ca0..3374752 100644 --- a/exercises/4-an-enslaved-hope/README.md +++ b/exercises/4-an-enslaved-hope/README.md @@ -156,16 +156,16 @@ > _OWASP ZAP (Zed Attack Proxy) is a free open source security tool used for finding security vulnerabilities in web applications._ -3. _Remove jenkins bit if this is already in somewhere, also check syntax, actually only do one git checkout_ First we're going to take the generic jenkins slave template from our exercise4/zap branch and the params. +3. First we're going to take the generic jenkins slave template from our exercise4/zap branch and the params. ```bash -$ git checkout exercise4/zap-and-arachni templates/jenkins-slave-generic-template.yml params/ +$ git checkout exercise4/zap-and-arachni params/ templates/jenkins-slave-generic-template.yml ``` 3. This should have created the following files: -- `templates/jenkins-slave-generic-template.yml` -- `params/ zap-bulid-pod arachni-build-pod` + - `templates/jenkins-slave-generic-template.yml` + - `params/ zap-bulid-pod arachni-build-pod` -3. Create an object in `insert donal's new layout here` called `zap-build-pod` and the following content: +3. Create an object in `inventory/host_vars/ci-cd-tooling.yml` called `zap-build-pod` and the following content: ```yml - name: "zap-build-pod" namespace: "<YOUR_NAME>-ci-cd" @@ -174,15 +174,15 @@ tags: - zap ``` - -3. Install ansible-y stuff (only if not run before???) +<p class="tip"> NOTE- Install your Openshift Applier dependency if it's disappeared. ```bash ansible-galaxy install -r requirements.yml --roles-path=roles ``` +</p> 3. Remember to login to the cluster! ```bash -oc login https://console.s8.core.rht-labs.com --token=<INSERT_LOGIN_TOKEN_HERE> +oc login https://console.your.domain.com --token=<INSERT_LOGIN_TOKEN_HERE> ``` 3. Run the ansible playbook filtering with tag `zap` so only the zap build pods are run. @@ -196,7 +196,7 @@ #### Part 2b - Arachni Scan > _Arachni is a feature-full, modular, high-performance Ruby framework aimed towards helping penetration testers and administrators evaluate the security of web applications._ -3. Create an object in `insert donal's new layout here` called `arachni-build-pod` and the following content: +3. Create an object in `inventory/host_vars/ci-cd-tooling.yml` called `arachni-build-pod` with the following content: ```yml - name: "arachni-build-pod" namespace: "<YOUR_NAME>-ci-cd" @@ -206,7 +206,7 @@ - arachni ``` -3. Run the ansible playbook filtering with tag `arachni` so only the zap build pods are run. +3. Run the ansible playbook filtering with tag `arachni` so only the arachni build pods are run. ```bash ansible-playbook roles/openshift-applier/playbooks/openshift-cluster-seed.yml \ -i inventory/ \ -e "filter_tags=arachni" ``` -- Gitblit v1.9.3