From 55fd036c8f9f3dee08580240104530e266e93418 Mon Sep 17 00:00:00 2001 From: OlgaGusarenko Date: Thu, 29 Sep 2016 19:39:49 +0300 Subject: [PATCH] Upgrade from Liberty to latest Mitaka * Adds the update to minor versions procedure * Moves backup and restore procedures to the UG Change-Id: I3f638ad4e14c789ea06b11de068e8c13489166a4 --- userdocs/fuel-install-guide.rst | 1 + userdocs/fuel-install-guide/update-fuel.rst | 73 +++++++++++++++++++ .../upgrade/upgrade-internals.rst | 6 +- .../{upgrade-fuel.rst => upgrade-liberty.rst} | 21 +++--- userdocs/fuel-install-guide/upgrade_intro.rst | 4 +- .../fuel-user-guide/maintain-environment.rst | 2 + .../maintain-environment}/backup-fuel.rst | 2 +- .../maintain-environment}/restore-fuel.rst | 2 +- 8 files changed, 92 insertions(+), 19 deletions(-) create mode 100644 userdocs/fuel-install-guide/update-fuel.rst rename userdocs/fuel-install-guide/upgrade/{upgrade-fuel.rst => upgrade-liberty.rst} (66%) rename userdocs/{fuel-install-guide/upgrade => fuel-user-guide/maintain-environment}/backup-fuel.rst (98%) rename userdocs/{fuel-install-guide/upgrade => fuel-user-guide/maintain-environment}/restore-fuel.rst (98%) diff --git a/userdocs/fuel-install-guide.rst b/userdocs/fuel-install-guide.rst index c0f25d4aa..cc0829954 100644 --- a/userdocs/fuel-install-guide.rst +++ b/userdocs/fuel-install-guide.rst @@ -13,5 +13,6 @@ Fuel Installation Guide fuel-install-guide/bootstrap_intro fuel-install-guide/plugins_intro fuel-install-guide/vsphere_intro + fuel-install-guide/update-fuel fuel-install-guide/upgrade_intro fuel-install-guide/preinstall_intro diff --git a/userdocs/fuel-install-guide/update-fuel.rst b/userdocs/fuel-install-guide/update-fuel.rst new file mode 100644 index 000000000..9031bb51e --- /dev/null +++ b/userdocs/fuel-install-guide/update-fuel.rst @@ -0,0 +1,73 @@ +.. _update_fuel: + +============================ +Update Fuel to latest Mitaka +============================ + +A number of the Fuel Newton features are back-ported to Mitaka after +the Fuel Mitaka release. You can update the Fuel Master node to consume +these features. + +**To update the Fuel Master node from the initially released Mitaka to the latest Mitaka version:** + +#. Log in to the Fuel Master node CLI as root. +#. Verify that the update repository, for example, ``mos-update``, is available + in the list of your repositories: + + .. code-block:: console + + cat /etc/yum.repos.d/mos-updates.repo + + If the update repository is unavailable, run: + + .. code-block:: console + + yum-config-manager --add-repo=http://mirror.fuel-infra.org/mos-repos/centos/mos9.0-centos7/updates/x86_64/ + rpm --import http://mirror.fuel-infra.org/mos-repos/centos/mos9.0-centos7/updates/RPM-GPG-KEY-mos9.0 + +#. Clean the YUM cache: + + .. code-block:: console + + yum clean all + +#. Install a code-based integrity check tool Cudet. This tool also includes + the necessary update commands for ``fuel2``: + + .. code-block:: console + + yum install python-cudet + +#. Prepare the Fuel Master node for the Noop run: + + .. code-block:: console + + update-prepare prepare master + + This command installs new ``fuel-nailgun`` and ``fuel-astute`` + packages on the Fuel Master node. Also, it executes Nailgun ``dbsync`` + and restarts the ``astute`` and ``nailgun`` services. + + If any ``fuel-nailgun`` extension is already installed on the Fuel Master node, the + ``update-prepare`` script does not restart the Nailgun services. + You should restart the Nailgun services manually using the following + command: + + .. code-block:: console + + systemctl restart assassind nailgun oswl_flavor_collectord \ + oswl_image_collectord oswl_keystone_user_collectord \ + oswl_tenant_collectord oswl_vm_collectord oswl_volume_collectord \ + receiverd statsenderd + +#. Update the Fuel Master node packages, services, and configuration: + + .. code-block:: console + + update-prepare update master + + .. warning:: During the update procedure, the Fuel Master node services + will be restarted automatically. + + The script calls ``yum update`` and then runs Puppet tasks to update + the Fuel Master node. \ No newline at end of file diff --git a/userdocs/fuel-install-guide/upgrade/upgrade-internals.rst b/userdocs/fuel-install-guide/upgrade/upgrade-internals.rst index 77d46b538..20b4dcb70 100644 --- a/userdocs/fuel-install-guide/upgrade/upgrade-internals.rst +++ b/userdocs/fuel-install-guide/upgrade/upgrade-internals.rst @@ -1,8 +1,8 @@ .. _upgrade-internals: -==================================== -Overview of the Fuel upgrade process -==================================== +======== +Overview +======== The upgrade is implemented with upgrade engines, which are python modules: diff --git a/userdocs/fuel-install-guide/upgrade/upgrade-fuel.rst b/userdocs/fuel-install-guide/upgrade/upgrade-liberty.rst similarity index 66% rename from userdocs/fuel-install-guide/upgrade/upgrade-fuel.rst rename to userdocs/fuel-install-guide/upgrade/upgrade-liberty.rst index 692f2ba33..b84da0150 100644 --- a/userdocs/fuel-install-guide/upgrade/upgrade-fuel.rst +++ b/userdocs/fuel-install-guide/upgrade/upgrade-liberty.rst @@ -1,10 +1,10 @@ -.. _upgrade-patch-top-ug: +.. _upgrade_liberty: -============================ -Upgrade the Fuel Master node -============================ +============================== +Upgrade Fuel Liberty to Mitaka +============================== -You can upgrade the Fuel Master node to the latest Fuel version. +You can upgrade the Fuel Master node from Liberty to Mitaka. After you upgrade Fuel, you can only deploy new environments of the corresponding Fuel version. Environments deployed using older versions of Fuel will remain operational. @@ -13,14 +13,9 @@ of Fuel will remain operational. #. Verify that no installations are in progress in any of your OpenStack environments. - #. Back up the Fuel Master node as described in :ref:`back-up-fuel`. - #. Power off the Fuel Master node. - -#. Restore the Fuel Master node to the latest version as described in - :ref:`restore-fuel`. - +#. Restore the Fuel Master node as described in :ref:`restore-fuel`. #. If you want to use CentOS-based bootstrap, rebuild the bootstrap image: .. code-block:: console @@ -32,6 +27,10 @@ of Fuel will remain operational. When Fuel completes the upgrade procedure, the *New Release available* message appears in the :guilabel:`Releases` tab. +Now, you can update to the latest Mitaka version that includes some features +back-ported from Newton after the Mitaka release. + .. seealso:: + * :ref:`update_fuel` * :ref:`install_configure_bootstrap` \ No newline at end of file diff --git a/userdocs/fuel-install-guide/upgrade_intro.rst b/userdocs/fuel-install-guide/upgrade_intro.rst index 682f48cbe..f5ab54cfb 100644 --- a/userdocs/fuel-install-guide/upgrade_intro.rst +++ b/userdocs/fuel-install-guide/upgrade_intro.rst @@ -13,9 +13,7 @@ This section includes the following topics. :maxdepth: 1 upgrade/upgrade-internals - upgrade/backup-fuel - upgrade/restore-fuel - upgrade/upgrade-fuel + upgrade/upgrade-liberty upgrade/upgrade-local-repo .. note:: Fuel does not support upgrades for plugins. The old plugin diff --git a/userdocs/fuel-user-guide/maintain-environment.rst b/userdocs/fuel-user-guide/maintain-environment.rst index 8bc8d6b86..7fc1d7152 100644 --- a/userdocs/fuel-user-guide/maintain-environment.rst +++ b/userdocs/fuel-user-guide/maintain-environment.rst @@ -15,6 +15,8 @@ This section includes the following topics: .. toctree:: :maxdepth: 1 + maintain-environment/backup-fuel + maintain-environment/restore-fuel maintain-environment/remove-node.rst maintain-environment/redeploy-node.rst maintain-environment/access-shell.rst diff --git a/userdocs/fuel-install-guide/upgrade/backup-fuel.rst b/userdocs/fuel-user-guide/maintain-environment/backup-fuel.rst similarity index 98% rename from userdocs/fuel-install-guide/upgrade/backup-fuel.rst rename to userdocs/fuel-user-guide/maintain-environment/backup-fuel.rst index b4d2eb63c..e37caa8ac 100644 --- a/userdocs/fuel-install-guide/upgrade/backup-fuel.rst +++ b/userdocs/fuel-user-guide/maintain-environment/backup-fuel.rst @@ -52,4 +52,4 @@ Now, you can upgrade or restore the Fuel Master node from the backup files. .. seealso:: * :ref:`restore-fuel` - * :ref:`upgrade-patch-top-ug` \ No newline at end of file + * :ref:`upgrade_liberty` \ No newline at end of file diff --git a/userdocs/fuel-install-guide/upgrade/restore-fuel.rst b/userdocs/fuel-user-guide/maintain-environment/restore-fuel.rst similarity index 98% rename from userdocs/fuel-install-guide/upgrade/restore-fuel.rst rename to userdocs/fuel-user-guide/maintain-environment/restore-fuel.rst index d94141faa..1d920cb2b 100644 --- a/userdocs/fuel-install-guide/upgrade/restore-fuel.rst +++ b/userdocs/fuel-user-guide/maintain-environment/restore-fuel.rst @@ -58,4 +58,4 @@ procedure. .. seealso:: * :ref:`back-up-fuel` - * :ref:`upgrade-patch-top-ug` \ No newline at end of file + * :ref:`upgrade_liberty` \ No newline at end of file