From b921353e5ab3436b0ddaa10bd852b55433c8ad5e Mon Sep 17 00:00:00 2001 From: donal <donalspring@gmail.com> Date: Tue, 17 Apr 2018 20:26:36 +0200 Subject: [PATCH] FIX lab instructions cuz of the rework --- 2-attack-of-the-pipelines/README.md | 10 +++++----- 1-the-manual-menace/README.md | 8 ++++---- images/exercise2/jenkins-slave-ansible.png | 0 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/1-the-manual-menace/README.md b/1-the-manual-menace/README.md index 312b437..753ab55 100644 --- a/1-the-manual-menace/README.md +++ b/1-the-manual-menace/README.md @@ -184,9 +184,9 @@ ``` ![ci-cd-deployments-yml](../images/exercise1/ci-cd-deployments-yml.png) -4. Run the OpenShift applier, specifying the tag `nexus` to speed up it's execution (`-e "target=ci-cd-tools"` is to run the other inventory). +4. Run the OpenShift applier, specifying the tag `nexus` to speed up it's execution (`-e target=tools` is to run the other inventory). ```bash -$ ansible-playbook apply.yml -e "target=ci-cd-tools" \ +$ ansible-playbook apply.yml -e target=tools \ -i inventory/ \ -e "filter_tags=nexus" ``` @@ -245,7 +245,7 @@ 4. Run the OpenShift applier, specifying the tag `gitlab` to speed up it's execution. ```bash -$ ansible-playbook apply.yml -e "target=ci-cd-tools" \ +$ ansible-playbook apply.yml -e target=tools \ -i inventory/ \ -e "filter_tags=gitlab" ``` @@ -380,7 +380,7 @@ 5. When your code is commited; run the OpenShift Applier to add the config to the cluster ```bash -$ ansible-playbook apply.yml -e "target=ci-cd-tools" \ +$ ansible-playbook apply.yml -e target=tools \ -i inventory/ \ -e "filter_tags=jenkins" ``` diff --git a/2-attack-of-the-pipelines/README.md b/2-attack-of-the-pipelines/README.md index dd083b7..62ef7d6 100644 --- a/2-attack-of-the-pipelines/README.md +++ b/2-attack-of-the-pipelines/README.md @@ -296,12 +296,12 @@ NAME=npm-jenkins-slave ``` -3. Create an item in the `inventory/group_vars/all.yml` under the `ci-cd-builds` object to run the template with. Don't forget to substitute `<YOUR_NAME>` +3. Create an item in the `inventory/host_vars/ci-cd-tooling.yml` under the `ci-cd-builds` object to run the template with. ```yaml - name: "jenkins-npm-slave" - namespace: "<YOUR_NAME>-ci-cd" - template: "{{ inventory_dir }}/../templates/jenkins-slave-generic-template.yml" - params: "{{ inventory_dir }}/../params/jenkins-slave-npm" + namespace: "{{ ci_cd_namespace }}" + template: "{{ playbook_dir }}/templates/jenkins-slave-generic-template.yml" + params: "{{ playbook_dir }}/params/jenkins-slave-npm" tags: - jenkins-slave ``` @@ -309,7 +309,7 @@ 3. Run the OpenShift Applier to trigger a build of this jenkins slave image. ```bash -$ ansible-playbook roles/openshift-applier/playbooks/openshift-cluster-seed.yml \ +$ ansible-playbook apply.yml -e target=tools \ -i inventory/ \ -e "filter_tags=jenkins-slave" ``` diff --git a/images/exercise2/jenkins-slave-ansible.png b/images/exercise2/jenkins-slave-ansible.png index 5f75cdd..fcd1185 100644 --- a/images/exercise2/jenkins-slave-ansible.png +++ b/images/exercise2/jenkins-slave-ansible.png Binary files differ -- Gitblit v1.9.3