From 3399516c551361254587c30fb0040a9d69541515 Mon Sep 17 00:00:00 2001
From: Billy Tat <btat@suse.com>
Date: Thu, 21 Nov 2019 15:49:56 -0800
Subject: [PATCH] Reverts https://github.com/SUSE/doc-cap/pull/510

which addressed https://github.com/SUSE/doc-cap/issues/450. #450
provided a verfied/working configuration based on using the master
node IP, but is inconsistent with other CAP resources. Reverting
to avoid confusion.
---
 xml/cap_depl_install_caasp.xml | 11 +++++------
 xml/cap_depl_stratos.xml       |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/xml/cap_depl_install_caasp.xml b/xml/cap_depl_install_caasp.xml
index 01ae86ec..5abf3d83 100644
--- a/xml/cap_depl_install_caasp.xml
+++ b/xml/cap_depl_install_caasp.xml
@@ -96,7 +96,7 @@
       </listitem>
       <listitem>
        <para>
-        Traffic inside of &productname; resolves to a &kube; master node in
+        Traffic inside of &productname; resolves to a &kube; worker node in
         that dedicated domain.
        </para>
       </listitem>
@@ -519,11 +519,11 @@ persistentvolume "pvc-c464ed6a-3852-11e8-bd10-90b8d0c59f1c" deleted
   <para>
    The example <filename>scf-config-values.yaml</filename> file is for a simple
    deployment without an ingress controller or external load balancer. Instead,
-   assign the master node an external IP address, and map this to the domain
+   assign the worker node an external IP address, and map this to the domain
    name to provide external access to the cluster. The
    <literal>external_ips</literal> parameter needs
    this address to provide access to the Stratos Web interface and other public
-   servers, and it also needs the internal IP addresses of the master node to provide
+   servers, and it also needs the internal IP addresses of the worker nodes to provide
    access to internal services.
 </para>
 
@@ -542,12 +542,11 @@ env:
   GARDEN_ROOTFS_DRIVER: "btrfs"
 
 kube:
-  # Specify the master node's external IP and internal IP
-  external_ips: ["<replaceable>&kubeip;</replaceable>", "<replaceable>&subnetI;</replaceable>"]
+  external_ips: ["<replaceable>&kubeip;</replaceable>", "<replaceable>&subnetI;</replaceable>", "<replaceable>&subnetII;</replaceable>", "<replaceable>&subnetIII;</replaceable>"]
 
   storage_class:
     persistent: <replaceable>"persistent"</replaceable>
-    shared: "shared"
+    shared: "persistent"
 
   # The registry the images will be fetched from.
   # The values below should work for
diff --git a/xml/cap_depl_stratos.xml b/xml/cap_depl_stratos.xml
index 3200f1b8..57a5e7ab 100644
--- a/xml/cap_depl_stratos.xml
+++ b/xml/cap_depl_stratos.xml
@@ -28,7 +28,7 @@
 
    <para>
       The steps in this section describe how to install Stratos on &susecaaspreg;
-      without an external load balancer, instead mapping the master node to your
+      without an external load balancer, instead mapping a worker node to your
       &productname; domain as described in
       <xref linkend="sec-cap-configure-prod"/>. These instructions assume you
       have followed the procedure in <xref linkend="cha-cap-depl-caasp"/>,