From 9640874a6a33dee6c49e2d27afb2d553a33be80a Mon Sep 17 00:00:00 2001 From: Eric Sauer Date: Fri, 16 Feb 2018 13:13:04 -0500 Subject: [PATCH] Updating README with new path --- basic-spring-boot/README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/basic-spring-boot/README.md b/basic-spring-boot/README.md index 7112c1f7..ab9b272f 100644 --- a/basic-spring-boot/README.md +++ b/basic-spring-boot/README.md @@ -17,7 +17,7 @@ This quickstart can be deployed quickly using Ansible. Here are the steps. 2. Log into an OpenShift cluster, then run the following command. ``` $ oc login -$ ansible-playbook -i container-pipelines/basic-spring-boot/inventory/ casl-ansible/playbooks/openshift-cluster-seed.yml +$ ansible-playbook -i ./applier/inventory/ /path/to/casl-ansible/playbooks/openshift-cluster-seed.yml ``` At this point you should have 3 projects deployed (`basic-spring-boot-dev`, `basic-spring-boot-stage`, and `basic-spring-boot-prod`) with our [Spring Rest](https://github.com/redhat-cop/spring-rest.git) demo application deployed to all 3. @@ -30,7 +30,7 @@ The following breaks down the architecture of the pipeline deployed, as well as The components of this pipeline are divided into two templates. -The first template, `files/builds/template.yml` is what we are calling the "Build" template. It contains: +The first template, `applier/templates/build.yml` is what we are calling the "Build" template. It contains: * A `jenkinsPipelineStrategy` BuildConfig * An `s2i` BuildConfig @@ -38,7 +38,7 @@ The first template, `files/builds/template.yml` is what we are calling the "Buil The build template contains a default source code repo for a java application compatible with this pipelines architecture (https://github.com/redhat-cop/spring-rest). -The second template, `files/deployments/template.yml` is the "Deploy" template. It contains: +The second template, `applier/templates/deployment.yml` is the "Deploy" template. It contains: * A tomcat8 DeploymentConfig * A Service definition @@ -77,7 +77,7 @@ For the purposes of this demo, we are going to create three stages for our appli In the spirit of _Infrastructure as Code_ we have a YAML file that defines the `ProjectRequests` for us. This is as an alternative to running `oc new-project`, but will yeild the same result. ``` -$ oc create -f projects/projects.yml +$ oc create -f applier/projects/projects.yml projectrequest "basic-spring-boot-dev" created projectrequest "basic-spring-boot-stage" created projectrequest "basic-spring-boot-prod" created @@ -99,7 +99,7 @@ service "jenkins" created ### 4. Instantiate Pipeline -A _deploy template_ is provided at `deploy/template.yml` that defines all of the resources required to run our Tomcat application. It includes: +A _deploy template_ is provided at `applier/templates/deployment.yml` that defines all of the resources required to run our Tomcat application. It includes: * A `Service` * A `Route` @@ -111,19 +111,19 @@ This template should be instantiated once in each of the namespaces that our app Deploy the deployment template to all three projects. ``` -$ oc process -f deploy/template.yml --param-file=deploy/dev/params | oc apply -f- +$ oc process -f applier/templates/deployment.yml --param-file=applier/params/deployment-dev | oc apply -f- service "spring-rest" created route "spring-rest" created imagestream "spring-rest" created deploymentconfig "spring-rest" created rolebinding "jenkins_edit" configured -$ oc process -f deploy/template.yml --param-file=deploy/stage/params | oc apply -f- +$ oc process -f applier/templates/deployment.yml --param-file=applier/params/deployments-stage | oc apply -f- service "spring-rest" created route "spring-rest" created imagestream "spring-rest" created deploymentconfig "spring-rest" created rolebinding "jenkins_edit" created -$ oc process -f deploy/template.yml --param-file=deploy/prod/params | oc apply -f- +$ oc process -f applier/templates/deployment.yml --param-file=applier/params/deployment-prod | oc apply -f- service "spring-rest" created route "spring-rest" created imagestream "spring-rest" created @@ -131,14 +131,14 @@ deploymentconfig "spring-rest" created rolebinding "jenkins_edit" created ``` -A _build template_ is provided at `build/template.yml` that defines all the resources required to build our java app. It includes: +A _build template_ is provided at `applier/templates/build.yml` that defines all the resources required to build our java app. It includes: * A `BuildConfig` that defines a `JenkinsPipelineStrategy` build, which will be used to define out pipeline. * A `BuildConfig` that defines a `Source` build with `Binary` input. This will build our image. Deploy the pipeline template in dev only. ``` -$ oc process -f build/template.yml --param-file build/dev/params | oc apply -f- +$ oc process -f applier/templates/build.yml --param-file applier/params/build-dev | oc apply -f- buildconfig "spring-rest-pipeline" created buildconfig "spring-rest" created ```