From 154c4d15af4eb157bf72a9fbde0c8c5194a0ac3a Mon Sep 17 00:00:00 2001 From: Andrew Feierabend Date: Wed, 18 Nov 2020 10:14:25 -0500 Subject: [PATCH] DOCS-13983 platform support add amzn linux2 3.6 --- source/administration/production-notes.txt | 8 ++++---- .../fact-check-amazon-linux-community.rst | 4 ++-- .../fact-check-amazon-linux-enterprise.rst | 4 ++-- source/includes/fact-platform-support-amazon.rst | 5 +++-- .../fact-platform-support-enterprise-amazon.rst | 5 +++-- source/includes/fact-platform-x86_64.rst | 10 +++++----- ...eps-install-mongodb-enterprise-on-amazon.yaml | 3 +-- ...ps-install-mongodb-enterprise-on-amazon2.yaml | 16 ++++++++++++++++ .../steps-install-mongodb-on-amazon.yaml | 2 ++ .../steps-install-mongodb-on-amazon2.yaml | 16 ++++++++++++++++ ...tall-mongodb-enterprise-on-amazon-tarball.txt | 12 +++++++++++- .../install-mongodb-enterprise-on-amazon.txt | 15 +++++++++++++-- source/tutorial/install-mongodb-on-amazon.txt | 15 +++++++++++++-- 13 files changed, 91 insertions(+), 24 deletions(-) create mode 100644 source/includes/steps-install-mongodb-enterprise-on-amazon2.yaml create mode 100644 source/includes/steps-install-mongodb-on-amazon2.yaml diff --git a/source/administration/production-notes.txt b/source/administration/production-notes.txt index 472285a753a..f3c6ed03764 100644 --- a/source/administration/production-notes.txt +++ b/source/administration/production-notes.txt @@ -73,13 +73,13 @@ Recommended Platforms ~~~~~~~~~~~~~~~~~~~~~ While MongoDB supports a variety of platforms, the following operating -systems are recommended for production use: +systems are recommended for production use on ``x86_64`` architecture: -- Amazon Linux +- Amazon Linux 2 - Debian 8 and 9 -- RHEL / CentOS 6, 7, and 8 +- :abbr:`RHEL (Red Hat Enterprise Linux)` / CentOS 6, 7, and 8 - SLES 12 -- Ubuntu LTS 16.04 +- Ubuntu LTS 18.04 and 16.04 - Windows Server 2016 .. seealso:: :ref:`prod-notes-platform-considerations` diff --git a/source/includes/fact-check-amazon-linux-community.rst b/source/includes/fact-check-amazon-linux-community.rst index 4edcd04998a..21112f3c351 100644 --- a/source/includes/fact-check-amazon-linux-community.rst +++ b/source/includes/fact-check-amazon-linux-community.rst @@ -5,7 +5,7 @@ following command on the command-line: grep ^NAME /etc/*release -The result should be **Amazon Linux AMI**. If using a different Linux -distribution, please see the +The result should be **Amazon Linux** or **Amazon Linux AMI**. If using +a different Linux distribution, please see the :doc:`install instructions for your platform `. diff --git a/source/includes/fact-check-amazon-linux-enterprise.rst b/source/includes/fact-check-amazon-linux-enterprise.rst index ce50e11bb63..511f08c6a54 100644 --- a/source/includes/fact-check-amazon-linux-enterprise.rst +++ b/source/includes/fact-check-amazon-linux-enterprise.rst @@ -5,7 +5,7 @@ following command on the command-line: grep ^NAME /etc/*release -The result should be **Amazon Linux AMI**. If using a different Linux -distribution, please see the +The result should be **Amazon Linux** or **Amazon Linux AMI**. If using +a different Linux distribution, please see the :doc:`install instructions for your platform `. diff --git a/source/includes/fact-platform-support-amazon.rst b/source/includes/fact-platform-support-amazon.rst index 5f6effc2092..f707a8bfa05 100644 --- a/source/includes/fact-platform-support-amazon.rst +++ b/source/includes/fact-platform-support-amazon.rst @@ -1,9 +1,10 @@ MongoDB {+version+} Community Edition supports the following -:red:`64-bit` Amazon Linux release on +:red:`64-bit` Amazon Linux releases on :ref:`x86_64` architecture: +- Amazon Linux 2 - Amazon Linux (2013.03 or later) -MongoDB only supports the 64-bit version of this platform. +MongoDB only supports the 64-bit version of these platforms. See :ref:`prod-notes-supported-platforms` for more information. diff --git a/source/includes/fact-platform-support-enterprise-amazon.rst b/source/includes/fact-platform-support-enterprise-amazon.rst index dc911462cac..a0098eba2fc 100644 --- a/source/includes/fact-platform-support-enterprise-amazon.rst +++ b/source/includes/fact-platform-support-enterprise-amazon.rst @@ -1,9 +1,10 @@ MongoDB {+version+} Enterprise Edition supports the following -:red:`64-bit` Amazon Linux release on +:red:`64-bit` Amazon Linux releases on :ref:`x86_64` architecture: +- Amazon Linux 2 - Amazon Linux (2013.03 or later) -MongoDB only supports the 64-bit version of this platform. +MongoDB only supports the 64-bit version of these platforms. See :ref:`prod-notes-supported-platforms` for more information. diff --git a/source/includes/fact-platform-x86_64.rst b/source/includes/fact-platform-x86_64.rst index 602d306d37d..807ed6d6b8b 100644 --- a/source/includes/fact-platform-x86_64.rst +++ b/source/includes/fact-platform-x86_64.rst @@ -28,6 +28,11 @@ - 3.4 Community & Enterprise - 3.2 Community & Enterprise + * - Amazon Linux 2 + - 3.6.22+ + - + - + * - Amazon Linux 2013.03 and later - |checkmark| - |checkmark| @@ -58,11 +63,6 @@ - |checkmark| - |checkmark| - * - RHEL/CentOS/Oracle Linux [#oracle-linux]_ 8.0 and later - - 3.6.17+ - - - - - * - SLES 12 - |checkmark| - |checkmark| diff --git a/source/includes/steps-install-mongodb-enterprise-on-amazon.yaml b/source/includes/steps-install-mongodb-enterprise-on-amazon.yaml index 1d2daf36bf7..7c79571a2ca 100644 --- a/source/includes/steps-install-mongodb-enterprise-on-amazon.yaml +++ b/source/includes/steps-install-mongodb-enterprise-on-amazon.yaml @@ -1,5 +1,3 @@ -title: Configure repository. -ref: install-repository stepnum: 1 level: 4 source: @@ -13,6 +11,7 @@ replacement: distro_num: "2013.03" --- stepnum: 2 +level: 4 source: file: steps-install-mongodb-enterprise-on-red-hat.yaml ref: install diff --git a/source/includes/steps-install-mongodb-enterprise-on-amazon2.yaml b/source/includes/steps-install-mongodb-enterprise-on-amazon2.yaml new file mode 100644 index 00000000000..ac14f2647b1 --- /dev/null +++ b/source/includes/steps-install-mongodb-enterprise-on-amazon2.yaml @@ -0,0 +1,16 @@ +stepnum: 1 +level: 4 +source: + file: steps-install-mongodb-enterprise-on-amazon.yaml + ref: install-repository +replacement: + distro_release: "2" + distro_version: "Amazon Linux 2" + distro_num: "2" +--- +stepnum: 2 +level: 4 +source: + file: steps-install-mongodb-enterprise-on-red-hat.yaml + ref: install +... diff --git a/source/includes/steps-install-mongodb-on-amazon.yaml b/source/includes/steps-install-mongodb-on-amazon.yaml index decbe69e4e3..7ddf12bac62 100644 --- a/source/includes/steps-install-mongodb-on-amazon.yaml +++ b/source/includes/steps-install-mongodb-on-amazon.yaml @@ -1,4 +1,5 @@ stepnum: 1 +level: 4 source: file: steps-install-mongodb-on-red-hat.yaml ref: config-yum @@ -10,6 +11,7 @@ replacement: distro_num: "2013.03" --- stepnum: 2 +level: 4 source: file: steps-install-mongodb-on-red-hat.yaml ref: install diff --git a/source/includes/steps-install-mongodb-on-amazon2.yaml b/source/includes/steps-install-mongodb-on-amazon2.yaml new file mode 100644 index 00000000000..9a330974538 --- /dev/null +++ b/source/includes/steps-install-mongodb-on-amazon2.yaml @@ -0,0 +1,16 @@ +stepnum: 1 +level: 4 +source: + file: steps-install-mongodb-on-amazon.yaml + ref: config-yum +replacement: + distro_release: "2" + distro_version: "Amazon Linux 2" + distro_num: "2" +--- +stepnum: 2 +level: 4 +source: + file: steps-install-mongodb-on-amazon.yaml + ref: install +... diff --git a/source/tutorial/install-mongodb-enterprise-on-amazon-tarball.txt b/source/tutorial/install-mongodb-enterprise-on-amazon-tarball.txt index f4710a88062..ed15f625584 100644 --- a/source/tutorial/install-mongodb-enterprise-on-amazon-tarball.txt +++ b/source/tutorial/install-mongodb-enterprise-on-amazon-tarball.txt @@ -68,7 +68,17 @@ Prerequisites .. include:: /includes/fact-tarball-dependencies.rst -.. include:: /includes/extracts/install-mongodb-enterprise-manually-redhat-6.rst +.. tabs:: + + .. tab:: Amazon Linux 2 + :tabid: amazon-linux-2 + + .. include:: /includes/extracts/install-mongodb-enterprise-manually-redhat-7.rst + + .. tab:: Amazon Linux 2013.03+ + :tabid: amazon-linux-2013.03 + + .. include:: /includes/extracts/install-mongodb-enterprise-manually-redhat-6.rst Procedure ~~~~~~~~~ diff --git a/source/tutorial/install-mongodb-enterprise-on-amazon.txt b/source/tutorial/install-mongodb-enterprise-on-amazon.txt index 1f7eb0ab7b7..1afcac46dbe 100644 --- a/source/tutorial/install-mongodb-enterprise-on-amazon.txt +++ b/source/tutorial/install-mongodb-enterprise-on-amazon.txt @@ -61,9 +61,20 @@ Install MongoDB Enterprise Edition ---------------------------------- Follow these steps to install MongoDB |edition| Edition using the -|package-manager| package manager. +|package-manager| package manager. Select the tab for your version of +Amazon Linux: -.. include:: /includes/steps/install-mongodb-enterprise-on-amazon.rst +.. tabs:: + + .. tab:: Amazon Linux 2 + :tabid: amazon-linux-2 + + .. include:: /includes/steps/install-mongodb-enterprise-on-amazon2.rst + + .. tab:: Amazon Linux (2013.03+) + :tabid: amazon-linux + + .. include:: /includes/steps/install-mongodb-enterprise-on-amazon.rst Run MongoDB Enterprise Edition ------------------------------ diff --git a/source/tutorial/install-mongodb-on-amazon.txt b/source/tutorial/install-mongodb-on-amazon.txt index 509cb62eaf6..391ca541ae1 100644 --- a/source/tutorial/install-mongodb-on-amazon.txt +++ b/source/tutorial/install-mongodb-on-amazon.txt @@ -61,9 +61,20 @@ Install MongoDB Community Edition --------------------------------- Follow these steps to install MongoDB |edition| Edition using the -|package-manager| package manager. +|package-manager| package manager. Select the tab for your version of +Amazon Linux: -.. include:: /includes/steps/install-mongodb-on-amazon.rst +.. tabs:: + + .. tab:: Amazon Linux 2 + :tabid: amazon-linux-2 + + .. include:: /includes/steps/install-mongodb-on-amazon2.rst + + .. tab:: Amazon Linux (2013.03+) + :tabid: amazon-linux + + .. include:: /includes/steps/install-mongodb-on-amazon.rst Run MongoDB Community Edition -----------------------------