Move note to the Stratos section.

SUSE · Jan 15, 2020 · 81dc7d0 · 81dc7d0
1 parent 184737d
commit 81dc7d0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/xml/cap_depl_aks.xml b/xml/cap_depl_aks.xml
@@ -459,9 +459,6 @@ env:
   # the UAA prefix is required
   UAA_HOST: uaa.<replaceable>example.com</replaceable>
   UAA_PORT: 2793
-  # default SCF namespace
-  UAA_ZONE: scf
-
   GARDEN_ROOTFS_DRIVER: "overlay-xfs"
 
 kube:

diff --git a/xml/cap_depl_eks.xml b/xml/cap_depl_eks.xml
@@ -300,8 +300,6 @@ env:
   DOMAIN: <replaceable>example.com</replaceable>
   UAA_HOST: uaa.<replaceable>example.com</replaceable>
   UAA_PORT: 2793
-  # default SCF namespace
-  UAA_ZONE: scf
 
   GARDEN_ROOTFS_DRIVER: overlay-xfs
   GARDEN_APPARMOR_PROFILE: ""
@@ -502,7 +500,7 @@ suse            https://kubernetes-charts.suse.com/</screen>
    load balancer name will be the string preceding the first
    <literal>-</literal> character.
   </para>
-
+ 
 <screen>&prompt.user;kubectl get service -n scf tcp-router-tcp-router-public</screen>
 
   <para>

diff --git a/xml/cap_depl_gke.xml b/xml/cap_depl_gke.xml
@@ -301,8 +301,6 @@ env:
   # the UAA prefix is required
   UAA_HOST: uaa.<replaceable>example.com</replaceable>
   UAA_PORT: 2793
-  # default SCF namespace
-  UAA_ZONE: scf
   GARDEN_ROOTFS_DRIVER: "overlay-xfs"
 
 kube:

diff --git a/xml/cap_depl_install_caasp.xml b/xml/cap_depl_install_caasp.xml
@@ -537,8 +537,6 @@ env:
   # <literal>uaa</literal> host and port
   UAA_HOST: uaa.<replaceable>&exampledomain;</replaceable>
   UAA_PORT: 2793
-  # default SCF namespace
-  UAA_ZONE: scf
 
   # btrfs (the default) is required for SLE-based &kube; nodes
   GARDEN_ROOTFS_DRIVER: "btrfs"

diff --git a/xml/cap_depl_stratos.xml b/xml/cap_depl_stratos.xml
@@ -63,6 +63,26 @@ sed 's/"namespace": "default"/"namespace": "stratos"/' | kubectl create --filena
      deploy<literal>uaa</literal> and <literal>scf</literal>:
   </para>
 
+<important>
+  <title>Non-default SCF namespace</title>
+  <para>If you used a non-default namespace for &scf;, you need to change the
+    <literal>UAA_ZONE</literal> environment variable in the
+    <filename>scf-config-values.yaml</filename> to the correct namespace. You
+    can do so in the <literal>env</literal> section:
+  </para>
+<screen>
+  env:
+    # Enter the domain you created for your CAP cluster
+    DOMAIN: example.com
+
+    # uaa host and port
+    UAA_HOST: uaa.example.com
+    UAA_PORT: 2793
+    # scf namespace, default is "scf"
+    UAA_ZONE: scf2
+</screen>
+</important>
+
 <screen>&prompt.user;helm install suse/console \
     --name <replaceable>susecf-console</replaceable> \
     --namespace stratos \