Merge pull request #529 from darkdoc/medical-diag-fixes

Medical diagnosis fixes

Author: mbaldessari

content/patterns/medical-diagnosis/demo-script.adoc

@@ -95,15 +95,11 @@ Look at all of the resources that have been created for this demo application. W
 
 We are deploying this demo using self-signed certificates that are untrusted by our browser. Unless you have provisioned valid certificates for your OpenShift cluster you must accept the invalid certificates for:
 
-* image-server | xraylab-1 namespace
 * s3-rgw | openshift-storage namespace
 * grafana | xraylab-1 namespace
 
 [source,shell]
 ----
-IMAGESERVER_ROUTE=https://$(oc get route -n xraylab-1 image-server -o jsonpath='{.spec.host}')
-
-echo $IMAGESERVER_ROUTE
 
 S3RGW_ROUTE=https://$(oc get route -n openshift-storage s3-rgw -o jsonpath='{.spec.host}')
 

content/patterns/medical-diagnosis/getting-started.adoc

@@ -9,9 +9,6 @@ aliases: /medical-diagnosis/getting-started/
 :_content-type: ASSEMBLY
 include::modules/comm-attributes.adoc[]
 
-//Module to be included
-//:_content-type: PROCEDURE
-//:imagesdir: ../../../images
 [id="deploying-med-pattern"]
 == Deploying the {med-pattern}
 
@@ -43,9 +40,6 @@ For information about creating the buckets on other cloud providers, see the fol
 * link:https://docs.microsoft.com/en-us/azure/storage/common/storage-account-create?tabs=azure-portal[Azure Blob Storage]
 * link:https://cloud.google.com/storage/docs/quickstart-console[GCP Cloud Storage]
 
-//Module to be included
-//:_content-type: PROCEDURE
-//:imagesdir: ../../../images
 
 [id="utilities"]
 == Utilities
@@ -240,9 +234,6 @@ Before you run the `./pattern.msh make install` command, ensure that you have th
 
 //image::/videos/predeploy.svg[link="/videos/predeploy.svg"]
 
-//Module to be included
-//:_content-type: PROCEDURE
-//:imagesdir: ../../../images
 [id="med-deploy-pattern_{context}"]
 == Deploy
 
@@ -270,9 +261,6 @@ image::/videos/xray-deployment.svg[link="/videos/xray-deployment.svg"]
 .. Check that the Operator is installed in the `openshift-operators` namespace and its status is `Succeeded`. Ensure that {ocp-data-short} is listed in the list of installed Operators.
 
 
-//Module to be included
-//:_content-type: PROCEDURE
-//:imagesdir: ../../../images
 [id="using-openshift-gitops-to-check-on-application-progress-getting-started"]
 === Using OpenShift GitOps to check on Application progress
 
@@ -316,23 +304,16 @@ Examine the `medical-diagnosis-hub` ArgoCD instance. You can track all the appli
 . Check that all applications are synchronized. There are thirteen different ArgoCD `applications` that are deployed as part of this pattern.
 
 
-//Module to be included
-//:_content-type: PROCEDURE
-//:imagesdir: ../../../images
 [id="viewing-the-grafana-based-dashboard-getting-started"]
 === Viewing the Grafana based dashboard
 
 . Accept the SSL certificates on the browser for the dashboard. In the {ocp} web console,  go to the Routes for project `openshift-storage``. Click the URL for the `s3-rgw`.
 +
-image::medical-edge/storage-route.png[link="/images/medical-edge/storage-route.png"]
+image::/images/medical-edge/storage-route.png[link="/images/medical-edge/storage-route.png"]
 +
 Ensure that you see some XML and not the access denied error message.
 +
-image::medical-edge/storage-rgw-route.png[link="/images/medical-edge/storage-rgw-route.png"]
-
-. While still looking at Routes, change the project to `xraylab-1`. Click the URL for the `image-server`. Ensure that you do not see an access denied error message. You must to see a `Hello World` message.
-+
-image::medical-edge/grafana-routes.png[link="/images/medical-edge/grafana-routes.png"]
+image::/images/medical-edge/storage-rgw-route.png[link="/images/medical-edge/storage-rgw-route.png"]
 
 . Turn on the image file flow. There are three ways to go about this.
 +
@@ -345,27 +326,24 @@ $ oc scale deployment/image-generator --replicas=1 -n xraylab-1
 +
 Or you can go to the OpenShift UI and change the view from Administrator to Developer and select Topology. From there select the `xraylab-1` project.
 +
-image::medical-edge/dev-topology.png[link="/images/medical-edge/dev-topology.png"]
+image::/images/medical-edge/dev-topology.png[link="/images/medical-edge/dev-topology.png"]
 +
 Right-click on the `image-generator` pod icon and select `Edit Pod count`.
 +
-image::medical-edge/dev-topology-menu.png[link="/images/medical-edge/dev-topology-menu.png"]
+image::/images/medical-edge/dev-topology-menu.png[link="/images/medical-edge/dev-topology-menu.png"]
 +
 Up the pod count from `0` to `1` and save.
 +
-image::medical-edge/dev-topology-pod-count.png[link="/images/medical-edge/dev-topology-pod-count.png"]
+image::/images/medical-edge/dev-topology-pod-count.png[link="/images/medical-edge/dev-topology-pod-count.png"]
 +
 Alternatively, you can have the same outcome on the Administrator console.
 +
 Go to the OpenShift UI under Workloads, select Deployments for Project `xraylab-1`.
 Click `image-generator` and increase the pod count to 1.
 +
-image::medical-edge/start-image-flow.png[link="/images/medical-edge/start-image-flow.png"]
+image::/images/medical-edge/start-image-flow.png[link="/images/medical-edge/start-image-flow.png"]
 
 
-//Module to be included
-//:_content-type: PROCEDURE
-//:imagesdir: ../../../images
 [id="making-some-changes-on-the-dashboard-getting-started"]
 === Making some changes on the dashboard