From da01ee1347be08c274c288525e50f4b84b988ea7 Mon Sep 17 00:00:00 2001
From: Jiri Stransky <jistr@redhat.com>
Date: Tue, 28 Aug 2018 14:19:04 +0200
Subject: [PATCH] Amend minor update docs for Rocky

Add the new external-update command for updating Ceph.

Change-Id: If336cd95f6ee17407b97ec17e59c98301de07a4a
---
 _custom/custom.css                            |  2 +-
 .../post_deployment/package_update.rst        | 49 +++++++++++++------
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/_custom/custom.css b/_custom/custom.css
index ac40a987..40812586 100644
--- a/_custom/custom.css
+++ b/_custom/custom.css
@@ -70,11 +70,11 @@
 .baremetal {background: #eef;}
 .virtual {background: #efe;}
 .ceph {background: #eff;}
-.ltom {background: #dee;}
 .mton {background: #ded;}
 .ntoo {background: #edd;}
 .otop {background: #dfb;}
 .ptoq {background: #afd;}
+.qtor {background: #dee;}
 .validations {background: #fdd;}
 .optional {background: #ffe;}
 
diff --git a/doc/source/install/post_deployment/package_update.rst b/doc/source/install/post_deployment/package_update.rst
index f5dadeb8..434166a6 100644
--- a/doc/source/install/post_deployment/package_update.rst
+++ b/doc/source/install/post_deployment/package_update.rst
@@ -90,27 +90,46 @@ the OpenStack release that you currently operate, perform these steps:
 #. **Ceph update (optional)**
 
    If your environment includes Ceph managed by TripleO (i.e. *not*
-   what TripleO calls "external Ceph"), update Ceph by running:
+   what TripleO calls "external Ceph"), you'll want to update Ceph at
+   this point too. The procedure differs between Queens and Rocky
+   releases:
 
-   .. code-block:: bash
+   .. admonition:: Queens
+      :class: ptoq
 
-      openstack overcloud ceph-upgrade run <OPTIONS>
+      Run:
 
-   In place of the `<OPTIONS>` token should go all parameters that you
-   used with previous `openstack overcloud update prepare` command
-   (including the new `-e container-params.yaml`).
+      .. code-block:: bash
 
-   .. note::
+         openstack overcloud ceph-upgrade run <OPTIONS>
 
-      The `ceph-upgrade run` command performs a Heat stack update, and
-      as such it should be passed all parameters currently used by the
-      Heat stack (most notably environment files, role counts, roles
-      data, and network data). This is crucial in order to keep
-      correct state of the stack.
+      In place of the `<OPTIONS>` token should go all parameters that you
+      used with previous `openstack overcloud update prepare` command
+      (including the new `-e container-params.yaml`).
 
-   The `ceph-upgrade run` command re-enables config management
-   operations previously disabled by `update prepare`, and triggers
-   the rolling update playbook of the Ceph installer (`ceph-ansible`).
+      .. note::
+
+         The `ceph-upgrade run` command performs a Heat stack update, and
+         as such it should be passed all parameters currently used by the
+         Heat stack (most notably environment files, role counts, roles
+         data, and network data). This is crucial in order to keep
+         correct state of the stack.
+
+      The `ceph-upgrade run` command re-enables config management
+      operations previously disabled by `update prepare`, and triggers
+      the rolling update playbook of the Ceph installer (`ceph-ansible`).
+
+   .. admonition:: Rocky
+      :class: qtor
+
+      Run:
+
+      .. code-block:: bash
+
+         openstack overcloud external-update run --tags ceph
+
+      This will update Ceph by running ceph-ansible installer with
+      update playbook.
 
 #. **Update convergence**