Skip to content

Commit

Permalink
Fix product setup for new base os and product version (#962)
Browse files Browse the repository at this point in the history
* fix product setup

Product is 4.5, based on SP2 and requires public cloud module

Signed-off-by: Jordi Massaguer Pla <jmassaguerpla@suse.de>

* Change base os version to entity

Co-authored-by: Markus Napp <mnapp@suse.com>
  • Loading branch information
jordimassaguerpla and Markus Napp authored Aug 11, 2020
1 parent da67b4b commit 77b5eb9
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 19 deletions.
7 changes: 6 additions & 1 deletion adoc/deployment-bare-metal-or-kvm.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,14 @@ the server configuration in your {ay} file. To do so add the following section:
<version>15.2</version>
<arch>x86_64</arch>
</addon>
<addon>
<name>sle-module-public-cloud</name>
<version>15.2</version>
<arch>x86_64</arch>
</addon>
<addon>
<name>caasp</name>
<version>5</version>
<version>4.5</version>
<arch>x86_64</arch>
</addon>
</addons>
Expand Down
7 changes: 4 additions & 3 deletions adoc/deployment-bootstrap.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ and defining which of the nodes are masters and which are workers. For maximum a

First you need to install `skuba` on a management machine, like your local workstation:

. Add the SLE15 SP1 extension containing `skuba`. This also requires the "containers" module.
. Add the SLE{base_os_version} extension containing `skuba`. This also requires the "containers" and the "public cloud" module.
+
[source,bash]
----
SUSEConnect -p sle-module-containers/15.1/x86_64
SUSEConnect -p caasp/4.0/x86_64 -r <PRODUCT_KEY>
SUSEConnect -p sle-module-containers/15.2/x86_64
SUSEConnect -p sle-module-public-cloud/15.2/x86_64
SUSEConnect -p caasp/4.5/x86_64 -r <PRODUCT_KEY>
----
. Install the management pattern with:
+
Expand Down
8 changes: 4 additions & 4 deletions adoc/deployment-loadbalancer.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ For production environments, we recommend the use of link:https://documentation.
[source,bash]
----
SUSEConnect -r CAASP_REGISTRATION_CODE
SUSEConnect --product sle-module-server-applications/15.1/x86_64
SUSEConnect --product sle-module-server-applications/15.2/x86_64
----
. Install Nginx:
+
Expand Down Expand Up @@ -185,18 +185,18 @@ If no connection succeeds within this interval (2x5s), the node will be marked a
[source,bash]
----
SUSEConnect -r CAASP_REGISTRATION_CODE
SUSEConnect --product sle-module-server-applications/15.1/x86_64
SUSEConnect --product sle-module-server-applications/15.2/x86_64
----
. Enable the source for the `haproxy` package:
* If you are using the {sle} {hasi}
+
----
SUSEConnect --product sle-ha/15.1/x86_64 -r ADDITIONAL_REGCODE
SUSEConnect --product sle-ha/15.2/x86_64 -r ADDITIONAL_REGCODE
----
* If you want the free (unsupported) package:
+
----
SUSEConnect --product PackageHub/15.1/x86_64
SUSEConnect --product PackageHub/15.2/x86_64
----
. Configure `/dev/log` for HAProxy chroot (optional)
+
Expand Down
10 changes: 6 additions & 4 deletions adoc/deployment-preparation.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -155,18 +155,20 @@ For any deployment type you will need `skuba` and `{tf}`. These packages are
available from the {productname} package sources. They are provided as an installation
"pattern" that will install dependencies and other required packages in one simple step.

Access to the packages requires the `{productname}` and `Containers` extension modules.
Access to the packages requires the `{productname}`, `Containers` and `Public Cloud` extension modules.
Enable the modules during the operating system installation or activate them using {suse} Connect.

[source,bash]
----
sudo SUSEConnect -r <CAASP_REGISTRATION_CODE> # <1>
sudo SUSEConnect -p sle-module-containers/15.1/x86_64 # <2>
sudo SUSEConnect -p caasp/4.0/x86_64 -r <CAASP_REGISTRATION_CODE> # <3>
sudo SUSEConnect -p sle-module-containers/15.2/x86_64 # <2>
sudo SUSEConnect -p sle-module-public-cloud/15.2/x86_64 # <3>
sudo SUSEConnect -p caasp/4.5/x86_64 -r <CAASP_REGISTRATION_CODE> # <4>
----
<1> Activate {sle}
<2> Add the free `Containers` module
<3> Add the {productname} extension with your registration code
<3> Add the free `Public Cloud` module
<4> Add the {productname} extension with your registration code

Install the required tools:
----
Expand Down
9 changes: 5 additions & 4 deletions adoc/deployment-sles.adoc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
== Deployment on Existing SLES Installation

If you already have a running {sls} {base_os_version} installation, you can add {productname}
to this installation using SUSE Connect. You also need to enable the "Containers"
module because it contains some dependencies required by {productname}.
to this installation using SUSE Connect. You also need to enable the "Containers" and "Public Cloud"
modules because it contains some dependencies required by {productname}.

=== Requirements

Expand Down Expand Up @@ -51,9 +51,10 @@ Substitute `<CAASP_REGISTRATION_CODE>` for the code from <<registration-code>>.

[source,bash]
----
SUSEConnect -p sle-module-containers/15.1/x86_64
SUSEConnect -p sle-module-containers/15.2/x86_64
SUSEConnect -p sle-module-public-cloud/15.2/x86_64
SUSEConnect -p caasp/4.0/x86_64 -r <CAASP_REGISTRATION_CODE>
SUSEConnect -p caasp/4.5/x86_64 -r <CAASP_REGISTRATION_CODE>
----

Repeat all preparation steps for any cluster nodes you wish to join.
Expand Down
6 changes: 3 additions & 3 deletions adoc/deployment-vmware.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -225,17 +225,17 @@ SUSEConnect -r CAASP_REGISTRATION_CODE
. Register the `Containers` module (free of charge):
+
----
SUSEConnect -p sle-module-containers/15.1/x86_64
SUSEConnect -p sle-module-containers/15.2/x86_64
----
. Register the `Public Cloud` module for basic `cloud-init` package (free of charge):
+
----
SUSEConnect -p sle-module-public-cloud/15.1/x86_64
SUSEConnect -p sle-module-public-cloud/15.2/x86_64
----
. Register the {productname} module. Substitute `<CAASP_REGISTRATION_CODE>` for the code from <<registration-code>>.
+
----
SUSEConnect -p caasp/4.0/x86_64 -r CAASP_REGISTRATION_CODE
SUSEConnect -p caasp/4.5/x86_64 -r CAASP_REGISTRATION_CODE
----
. Install required packages. As root, run:
+
Expand Down

0 comments on commit 77b5eb9

Please sign in to comment.