From e90e9c00de9d3592889df0181e78c5d38c0acfd3 Mon Sep 17 00:00:00 2001 From: acammies <acammies@redhat.com> Date: Wed, 11 Apr 2018 14:50:14 +0200 Subject: [PATCH] new image and more changes --- exercises/images/exercise2/ocp-app-deployment-overview.jpeg | 0 exercises/1-the-manual-menace/README.md | 2 +- exercises/2-attack-of-the-pipelines/README.md | 8 ++++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/exercises/1-the-manual-menace/README.md b/exercises/1-the-manual-menace/README.md index 5fa7f69..c240cb6 100644 --- a/exercises/1-the-manual-menace/README.md +++ b/exercises/1-the-manual-menace/README.md @@ -359,7 +359,7 @@ 6. Log in to Jenkins and hit `New Item` . -6. Create a freesyle job called `hello-world` . +6. Create a freestyle job called `hello-world` . 6. On the Source Code Management tab; add your `enablement-ci-cd` git repo and hit the dropdown to add your credentials we baked into the s2i on previous steps  diff --git a/exercises/2-attack-of-the-pipelines/README.md b/exercises/2-attack-of-the-pipelines/README.md index f3d4a42..75b1b73 100644 --- a/exercises/2-attack-of-the-pipelines/README.md +++ b/exercises/2-attack-of-the-pipelines/README.md @@ -363,7 +363,7 @@ 4. Once successful, `commit` and `push` your changes to gitlab. -4. Back on your terminal navigate to the root of the `todolist-api` application. Open the `.openshift-applier` directory. The same layout of the frontend app should be visible with one noticeable difference; the api requires a `MongoDB` to connect to at runtime. +4. Back on your terminal navigate to the root of the `todolist-api` application. Open the `.openshift-applier` directory. The same layout as seen in `todolist-fe` should be visible with one noticeable difference; the api requires `MongoDB` to connect to at runtime. 4. In the `apply.yml` update the namespace `<YOUR_NAME>` variables accordingly. For example: ```yaml @@ -381,12 +381,16 @@ NAMESPACE=donal-dev ``` -4. Finally; run the applier and install it's dependencies to run the content into the cluster +4. Finally; run the applier and install its dependencies to run the content into the cluster ```bash $ ansible-galaxy install -r requirements.yml --roles-path=roles $ ansible-playbook apply.yml -i inventory/ ``` +4. Validate the build and deploy configs have been created in Openshift by checking `<YOUR_NAME> CI-CD builds` for the `BuildConfigs` + +4. Check `<YOUR_NAME>-dev` for the deployment  + ### Part 4 - Build > Bake > Deploy > _In this exercise; we take what we have working locally and get it working in OpenShift_ diff --git a/exercises/images/exercise2/ocp-app-deployment-overview.jpeg b/exercises/images/exercise2/ocp-app-deployment-overview.jpeg new file mode 100644 index 0000000..b613be6 --- /dev/null +++ b/exercises/images/exercise2/ocp-app-deployment-overview.jpeg Binary files differ -- Gitblit v1.9.3