From 77b5eb9c8666de6705fabe4a2fb7d3ab2d993129 Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Pla Date: Tue, 11 Aug 2020 12:14:10 +0200 Subject: [PATCH] Fix product setup for new base os and product version (#962) * fix product setup Product is 4.5, based on SP2 and requires public cloud module Signed-off-by: Jordi Massaguer Pla * Change base os version to entity Co-authored-by: Markus Napp --- adoc/deployment-bare-metal-or-kvm.adoc | 7 ++++++- adoc/deployment-bootstrap.adoc | 7 ++++--- adoc/deployment-loadbalancer.adoc | 8 ++++---- adoc/deployment-preparation.adoc | 10 ++++++---- adoc/deployment-sles.adoc | 9 +++++---- adoc/deployment-vmware.adoc | 6 +++--- 6 files changed, 28 insertions(+), 19 deletions(-) diff --git a/adoc/deployment-bare-metal-or-kvm.adoc b/adoc/deployment-bare-metal-or-kvm.adoc index 235d86864..c87cf33ba 100644 --- a/adoc/deployment-bare-metal-or-kvm.adoc +++ b/adoc/deployment-bare-metal-or-kvm.adoc @@ -107,9 +107,14 @@ the server configuration in your {ay} file. To do so add the following section: 15.2 x86_64 + + sle-module-public-cloud + 15.2 + x86_64 + caasp - 5 + 4.5 x86_64 diff --git a/adoc/deployment-bootstrap.adoc b/adoc/deployment-bootstrap.adoc index c31f64581..958f96053 100644 --- a/adoc/deployment-bootstrap.adoc +++ b/adoc/deployment-bootstrap.adoc @@ -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 +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 ---- . Install the management pattern with: + diff --git a/adoc/deployment-loadbalancer.adoc b/adoc/deployment-loadbalancer.adoc index cfe7646f4..dd3c45373 100644 --- a/adoc/deployment-loadbalancer.adoc +++ b/adoc/deployment-loadbalancer.adoc @@ -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: + @@ -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) + diff --git a/adoc/deployment-preparation.adoc b/adoc/deployment-preparation.adoc index 94dfadec2..cb98b8f07 100644 --- a/adoc/deployment-preparation.adoc +++ b/adoc/deployment-preparation.adoc @@ -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 # <1> -sudo SUSEConnect -p sle-module-containers/15.1/x86_64 # <2> -sudo SUSEConnect -p caasp/4.0/x86_64 -r # <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 # <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: ---- diff --git a/adoc/deployment-sles.adoc b/adoc/deployment-sles.adoc index ac55c500e..ad11cefff 100644 --- a/adoc/deployment-sles.adoc +++ b/adoc/deployment-sles.adoc @@ -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 @@ -51,9 +51,10 @@ Substitute `` for the code from <>. [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 +SUSEConnect -p caasp/4.5/x86_64 -r ---- Repeat all preparation steps for any cluster nodes you wish to join. diff --git a/adoc/deployment-vmware.adoc b/adoc/deployment-vmware.adoc index 11a4b6bc4..6399d1b9a 100644 --- a/adoc/deployment-vmware.adoc +++ b/adoc/deployment-vmware.adoc @@ -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 `` for the code from <>. + ---- -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: +