From d4bc4c36365e65d05d6655a2ce346a868b47ac38 Mon Sep 17 00:00:00 2001 From: ebner Date: Wed, 7 Aug 2024 15:04:26 +0200 Subject: [PATCH] cleanup --- _toc.yml | 12 +++------ .../{architecture => }/accounts-and-groups.md | 0 .../{architecture => }/active-directory.md | 0 admin-guide/container.md | 23 ++++++++++++++++ admin-guide/container/docker.md | 26 ------------------- admin-guide/container/index.md | 6 ----- admin-guide/container/podman.md | 8 ------ admin-guide/third-party.rst | 22 ---------------- 8 files changed, 26 insertions(+), 71 deletions(-) rename admin-guide/{architecture => }/accounts-and-groups.md (100%) rename admin-guide/{architecture => }/active-directory.md (100%) create mode 100644 admin-guide/container.md delete mode 100644 admin-guide/container/docker.md delete mode 100644 admin-guide/container/index.md delete mode 100644 admin-guide/container/podman.md delete mode 100644 admin-guide/third-party.rst diff --git a/_toc.yml b/_toc.yml index 4165ebf0..f59204aa 100644 --- a/_toc.yml +++ b/_toc.yml @@ -26,10 +26,6 @@ chapters: - file: admin-guide/index sections: - - file: admin-guide/architecture - sections: - - file: admin-guide/architecture/accounts-and-groups - - file: admin-guide/architecture/active-directory - file: admin-guide/configuration sections: - file: admin-guide/configuration/icinga2 @@ -64,10 +60,7 @@ chapters: - file: admin-guide/configuration/citrix_vda - file: admin-guide/configuration/configuration_email - file: admin-guide/configuration/selinux_configuration - - file: admin-guide/container/index - sections: - - file: admin-guide/container/docker - - file: admin-guide/container/podman + - file: admin-guide/container - file: admin-guide/deployment sections: - file: admin-guide/deployment/sample @@ -96,6 +89,8 @@ chapters: - glob: admin-guide/puppet/components/* - file: admin-guide/puppet/development - file: admin-guide/selinux + - file: admin-guide/accounts-and-groups + - file: admin-guide/active-directory - file: admin-guide/updates - file: admin-guide/mgmt-tools sections: @@ -109,7 +104,6 @@ chapters: - file: admin-guide/operations/deployment - file: admin-guide/operations/ip-address-change - file: admin-guide/operations/version-control - - file: admin-guide/third-party - file: admin-guide/troubleshooting sections: - file: admin-guide/troubleshooting/methods-and-tools diff --git a/admin-guide/architecture/accounts-and-groups.md b/admin-guide/accounts-and-groups.md similarity index 100% rename from admin-guide/architecture/accounts-and-groups.md rename to admin-guide/accounts-and-groups.md diff --git a/admin-guide/architecture/active-directory.md b/admin-guide/active-directory.md similarity index 100% rename from admin-guide/architecture/active-directory.md rename to admin-guide/active-directory.md diff --git a/admin-guide/container.md b/admin-guide/container.md new file mode 100644 index 00000000..5ad1ef92 --- /dev/null +++ b/admin-guide/container.md @@ -0,0 +1,23 @@ +# Container + +```{warning} +There are two container runtimes supported by us, but only one by Redhat. If you want to use Redhat third level support you'd have to use Podman. Be aware that compose files and run commands can vary between docker-ce and podman! +``` + + +## Docker +Docker-CE will have always the latest features in docker engine and docker compose. +The docker repo is enabled by default and the packages can be installed by using follwing code in hiera. +``` +base::pkg_group::extra: + - 'docker-ce' +``` + +## Podman +Podman engine runs "rootless" without any further configuration and is supported by Redhat Enterprise Support. +The Hiera configuration to install docker-podman with hiera would look like this: +``` +base::pkg_group::extra: + - 'docker' +``` +This will install podman from the appstream repository. diff --git a/admin-guide/container/docker.md b/admin-guide/container/docker.md deleted file mode 100644 index 8a9ad21e..00000000 --- a/admin-guide/container/docker.md +++ /dev/null @@ -1,26 +0,0 @@ -# Docker - -## Disclaimer -There are two container runtimes supported by us, but only one by Redhat. If you want to use Redhat third level support you'd have to use Podman. -Be aware that compose files and run commands can vary between docker-ce and podman! - -## Docker -Docker-CE will have always the latest features in docker engine and docker compose. -The docker repo is enabled by default and the packages can be installed by using follwing code in hiera. -``` -base::pkg_group::extra: - - 'docker-ce' -``` - -## Desktop Systems - -Up to now the desktop/console setup (i.e. installing the yum group "@Server with GUI") installes podman by default (via the yum group "@Container Management") -Until this is fixed (see merge request: https://git.psi.ch/linux-infra/puppet/-/merge_requests/1256) -following exclude statement must be included in hiera: - -``` -base::package_exclude: - - 'podman' - - 'cockpit-podman' - - 'buildah' -``` diff --git a/admin-guide/container/index.md b/admin-guide/container/index.md deleted file mode 100644 index 835853ea..00000000 --- a/admin-guide/container/index.md +++ /dev/null @@ -1,6 +0,0 @@ -# Container - -Contents: - -```{tableofcontents} -``` diff --git a/admin-guide/container/podman.md b/admin-guide/container/podman.md deleted file mode 100644 index c606bbd1..00000000 --- a/admin-guide/container/podman.md +++ /dev/null @@ -1,8 +0,0 @@ -# Podman -Podman engine runs "rootless" without any further configuration and is supported by Redhat Enterprise Support. -The Hiera configuration to install docker-podman with hiera would look like this: -``` -base::pkg_group::extra: - - 'docker' -``` -This will install podman from the appstream repository. \ No newline at end of file diff --git a/admin-guide/third-party.rst b/admin-guide/third-party.rst deleted file mode 100644 index ec937166..00000000 --- a/admin-guide/third-party.rst +++ /dev/null @@ -1,22 +0,0 @@ -Third-party Documentation -========================= - -.. _bash_style_guides: - - -Style Guides/Coding standards ------------------------------ - -.. To add a new version to this repository, save as HTML in Firefox and copy to /_static. - -1. The :download:`Google Shell Style Guide <_static/Shell Style Guide.html>` - (`original `_) - - -Product Documentation ---------------------- - -1. `Red Hat Enterprise Linux documentation `_: - - - `Desktop Migration and Administration Guide `_ -