From 6c2f8b287cb703e72040a05c6dfe0e92462ff9bf Mon Sep 17 00:00:00 2001 From: amanda Date: Mon, 27 Apr 2020 11:04:42 +0100 Subject: [PATCH 1/6] Update upgrade and uninstall as mistral not used on RHEL/Centos 8 - resolves #977 --- docs/source/install/uninstall.rst | 17 ++++++++++++++++- docs/source/install/upgrades.rst | 10 +++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/docs/source/install/uninstall.rst b/docs/source/install/uninstall.rst index 87540b51f..70afc6e0e 100644 --- a/docs/source/install/uninstall.rst +++ b/docs/source/install/uninstall.rst @@ -98,7 +98,7 @@ below. Only execute the instructions for your distribution. sudo apt-get purge st2 st2mistral st2chatops st2web bwc-ui st2flow -* RHEL/CentOS: +* RHEL/CentOS 6.x/7.x: If you are using StackStorm only: @@ -113,6 +113,21 @@ below. Only execute the instructions for your distribution. sudo yum erase st2 st2mistral st2chatops st2web st2python bwc-ui st2flow +* RHEL/CentOS 8.x: + + If you are using StackStorm only: + + .. sourcecode:: bash + + sudo yum erase st2 st2chatops st2web st2python + + If you have |ewc| installed, instead use: + + .. sourcecode:: bash + + sudo yum erase st2 st2chatops st2web st2python bwc-ui st2flow + + 3. Remove |st2| System User --------------------------- diff --git a/docs/source/install/upgrades.rst b/docs/source/install/upgrades.rst index cffd0582f..38d8089af 100644 --- a/docs/source/install/upgrades.rst +++ b/docs/source/install/upgrades.rst @@ -130,14 +130,22 @@ This is the standard upgrade procedure: sudo apt-get install --only-upgrade st2 st2web st2chatops st2mistral - RHEL/CentOS: + RHEL/CentOS 6.x/7.x: .. sourcecode:: bash sudo yum update st2 st2web st2chatops st2mistral + RHEL/CentOS 8.x: + + .. sourcecode:: bash + + sudo yum update st2 st2web st2chatops + 3. Upgrade Mistral database: +This section can be skipped if running on RHEL/Centos 8.x as Mistral is not installed on these distributions. + .. sourcecode:: bash /opt/stackstorm/mistral/bin/mistral-db-manage --config-file /etc/mistral/mistral.conf upgrade head From 4da8c7301504c9d376b0b7a6c243de9f15cf5370 Mon Sep 17 00:00:00 2001 From: amanda Date: Mon, 27 Apr 2020 11:06:13 +0100 Subject: [PATCH 2/6] Update upgrade and uninstall as mistral not used on RHEL/Centos 8 - resolves #977 --- docs/source/install/upgrades.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/install/upgrades.rst b/docs/source/install/upgrades.rst index 38d8089af..b330ca5f1 100644 --- a/docs/source/install/upgrades.rst +++ b/docs/source/install/upgrades.rst @@ -144,7 +144,7 @@ This is the standard upgrade procedure: 3. Upgrade Mistral database: -This section can be skipped if running on RHEL/Centos 8.x as Mistral is not installed on these distributions. +This step can be skipped if running on RHEL/Centos 8.x as Mistral is not installed on these distributions. .. sourcecode:: bash From 4d4218c11b7c6f316b3fc4339c708402a3bf6abf Mon Sep 17 00:00:00 2001 From: amanda Date: Tue, 28 Apr 2020 10:43:41 +0100 Subject: [PATCH 3/6] More generic on no need for mistral on uninstall --- docs/source/install/uninstall.rst | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/docs/source/install/uninstall.rst b/docs/source/install/uninstall.rst index 70afc6e0e..8aa239f81 100644 --- a/docs/source/install/uninstall.rst +++ b/docs/source/install/uninstall.rst @@ -98,7 +98,7 @@ below. Only execute the instructions for your distribution. sudo apt-get purge st2 st2mistral st2chatops st2web bwc-ui st2flow -* RHEL/CentOS 6.x/7.x: +* RHEL/CentOS: If you are using StackStorm only: @@ -113,19 +113,10 @@ below. Only execute the instructions for your distribution. sudo yum erase st2 st2mistral st2chatops st2web st2python bwc-ui st2flow -* RHEL/CentOS 8.x: - - If you are using StackStorm only: - - .. sourcecode:: bash - - sudo yum erase st2 st2chatops st2web st2python - - If you have |ewc| installed, instead use: +.. warning:: - .. sourcecode:: bash + Omit st2mistral from list of packages if Mistral is not installed in your installation - sudo yum erase st2 st2chatops st2web st2python bwc-ui st2flow 3. Remove |st2| System User From 19e7dcfda06ff2c9525ed0083a5eafea2f5eeaea Mon Sep 17 00:00:00 2001 From: amanda Date: Tue, 28 Apr 2020 10:51:34 +0100 Subject: [PATCH 4/6] Added notes for mistral --- docs/source/install/uninstall.rst | 2 +- docs/source/install/upgrades.rst | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/docs/source/install/uninstall.rst b/docs/source/install/uninstall.rst index 8aa239f81..33b4880c8 100644 --- a/docs/source/install/uninstall.rst +++ b/docs/source/install/uninstall.rst @@ -113,7 +113,7 @@ below. Only execute the instructions for your distribution. sudo yum erase st2 st2mistral st2chatops st2web st2python bwc-ui st2flow -.. warning:: +.. note:: Omit st2mistral from list of packages if Mistral is not installed in your installation diff --git a/docs/source/install/upgrades.rst b/docs/source/install/upgrades.rst index b330ca5f1..aa91fad11 100644 --- a/docs/source/install/upgrades.rst +++ b/docs/source/install/upgrades.rst @@ -130,23 +130,19 @@ This is the standard upgrade procedure: sudo apt-get install --only-upgrade st2 st2web st2chatops st2mistral - RHEL/CentOS 6.x/7.x: + RHEL/CentOS: .. sourcecode:: bash sudo yum update st2 st2web st2chatops st2mistral - RHEL/CentOS 8.x: +.. note:: - .. sourcecode:: bash - - sudo yum update st2 st2web st2chatops + Omit st2mistral from list of packages if Mistral is not installed in your installation 3. Upgrade Mistral database: -This step can be skipped if running on RHEL/Centos 8.x as Mistral is not installed on these distributions. - - .. sourcecode:: bash +This step can be skipped if Mistral is not installed on your installation. /opt/stackstorm/mistral/bin/mistral-db-manage --config-file /etc/mistral/mistral.conf upgrade head /opt/stackstorm/mistral/bin/mistral-db-manage --config-file /etc/mistral/mistral.conf populate | grep -v -e openstack -e keystone -e ironicclient From 8de9e758b0775755f88151dbbd336252da856a1d Mon Sep 17 00:00:00 2001 From: amanda Date: Tue, 28 Apr 2020 10:58:41 +0100 Subject: [PATCH 5/6] Missed source block --- docs/source/install/upgrades.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/source/install/upgrades.rst b/docs/source/install/upgrades.rst index aa91fad11..99d91839b 100644 --- a/docs/source/install/upgrades.rst +++ b/docs/source/install/upgrades.rst @@ -144,6 +144,8 @@ This is the standard upgrade procedure: This step can be skipped if Mistral is not installed on your installation. + .. sourcecode:: bash + /opt/stackstorm/mistral/bin/mistral-db-manage --config-file /etc/mistral/mistral.conf upgrade head /opt/stackstorm/mistral/bin/mistral-db-manage --config-file /etc/mistral/mistral.conf populate | grep -v -e openstack -e keystone -e ironicclient From dff51397dc716fcb2ac65aec8d2f107accf92454 Mon Sep 17 00:00:00 2001 From: amanda Date: Tue, 28 Apr 2020 11:51:20 +0100 Subject: [PATCH 6/6] Minor changes --- docs/source/install/upgrades.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/install/upgrades.rst b/docs/source/install/upgrades.rst index 99d91839b..06f4631a3 100644 --- a/docs/source/install/upgrades.rst +++ b/docs/source/install/upgrades.rst @@ -136,13 +136,13 @@ This is the standard upgrade procedure: sudo yum update st2 st2web st2chatops st2mistral -.. note:: + .. note:: - Omit st2mistral from list of packages if Mistral is not installed in your installation + Omit st2mistral from list of packages if Mistral is not installed in your installation 3. Upgrade Mistral database: -This step can be skipped if Mistral is not installed on your installation. + This step can be skipped if Mistral is not installed on your installation. .. sourcecode:: bash