From 82e4b0e335de4e970033a2161e8d7d74240888a6 Mon Sep 17 00:00:00 2001
From: Elaine Fonaro <elaine.fonaro@windriver.com>
Date: Wed, 6 Apr 2022 14:09:28 -0300
Subject: [PATCH] Updated Restore OpenStack from a Backup - new command lines.

Minor style updates done.

Removed the footnote and added the document reference :ref:

Updated the Footnote [#].

Signed-off-by: Elaine Fonaro <elaine.fonaro@windriver.com>
Change-Id: Icafcab66634237bef72d253cec3f6240f1c67d45
---
 .../restore-openstack-from-a-backup.rst       | 70 +++++++++++--------
 1 file changed, 39 insertions(+), 31 deletions(-)

diff --git a/doc/source/backup/openstack/restore-openstack-from-a-backup.rst b/doc/source/backup/openstack/restore-openstack-from-a-backup.rst
index d997a6983..10e6c7c4e 100644
--- a/doc/source/backup/openstack/restore-openstack-from-a-backup.rst
+++ b/doc/source/backup/openstack/restore-openstack-from-a-backup.rst
@@ -51,17 +51,20 @@ Restore only application system data
 
 Run the following command:
 
-.. parsed-literal::
+.. code-block:: none
 
-    ~(keystone_admin)$ ansible-playbook /usr/share/ansible/|prefix|-ansible/playbooks/ \
-    restore_openstack.yml \
-    -e 'initial_backup_dir=<location_of_backup_filename> \
-    ansible_become_pass=<admin_password> \
-    admin_password=<admin_password> \
-    backup_filename=<nnn>-openstack_backup.tgz'
+    ~(keystone_admin)$ ansible-playbook /usr/share/ansible/stx-ansible/playbooks/ restore_openstack.yml -e "@localhost-restore.yaml"
 
-Where ``<nnn>`` is a user-defined value, such as |prefix| or the backup
-date.
+.. code-block:: none
+
+    cat << EOF > localhost-restore.yaml
+    ---
+    ansible_become_pass: "<admin_password>"
+    admin_password: "<admin_password>"
+    initial_backup_dir: "<location_of_backup_filename>"
+    backup_filename: "<openstack_tgz_backup_filename>"
+    ...
+    EOF
 
 
 -----------------------------------------------------------------
@@ -70,18 +73,22 @@ Restore application system data, cinder volumes and glance images
 
 #.  Run the following command:
 
-    .. parsed-literal::
+    .. code-block:: none
 
-        ~(keystone_admin)$ ansible-playbook /usr/share/ansible/|prefix|-ansible/playbooks/ \
-        restore_openstack.yml \
-        -e 'restore_cinder_glance_data=true \
-        initial_backup_dir=<location_of_backup_filename> \
-        ansible_become_pass=<admin_password> \
-        admin_password=<admin_password> \
-        backup_filename=<nnn>-openstack_backup.tgz'
+        ~(keystone_admin)$ ansible-playbook /usr/share/ansible/stx-ansible/playbooks/ restore_openstack.yml -e "@localhost-restore.yaml"
+
+    .. code-block:: none
+
+        cat << EOF > localhost-restore.yaml
+        ---
+        ansible_become_pass: "<admin_password>"
+        admin_password: "<admin_password>"
+        initial_backup_dir: "<location_of_backup_filename>"
+        backup_filename: "<openstack_tgz_backup_filename>"
+        restore_cinder_glance_data="true"
+        ...
+        EOF
 
-    Where ``<nnn>`` is a user-defined value, such as |prefix| or the backup
-    date.
 
     When this step has completed, the Cinder, Glance and MariaDB services will
     be up, and Mariadb data restored.
@@ -97,7 +104,7 @@ Restore application system data, cinder volumes and glance images
             ~(keystone_admin)$ rbd import -p cinder-volumes /tmp/611157b9-78a4-4a26-af16-f9ff75a85e1b
 
         Where ``tmp/611157b9-78a4-4a26-af16-f9ff75a85e1b`` is a file saved
-        earlier at the backup procedure as described in [#]_ .
+        earlier at the backup procedure as described in :ref:`Back up OpenStack<back-up-openstack>`.
 
     #.  Restore Glance images using the :command:`image-backup` script.
 
@@ -123,17 +130,18 @@ Restore application system data, cinder volumes and glance images
 #.  Run the playbook again with the ``restore_openstack_continue`` flag set to
     ``true`` to bring up the remaining OpenStack services.
 
-    .. parsed-literal::
+    .. code-block:: none
 
-        ~(keystone_admin)$ ansible-playbook /usr/share/ansible/|prefix|-ansible/playbooks/ \
-        restore_openstack.yml \
-        -e 'restore_openstack_continue=true \
-        initial_backup_dir=<location_of_backup_filename>
-        ansible_become_pass=<admin_password> \
-        admin_password=<admin_password> \
-        backup_filename=<nnn>-openstack_backup.tgz'
+        ~(keystone_admin)$ ansible-playbook /usr/share/ansible/stx-ansible/playbooks/ restore_openstack.yml -e "@localhost-restore.yaml"
 
-    Where ``<nnn>`` is a user-defined value, such as |prefix| or the backup
-    date.
+    .. code-block:: none
 
-.. include:: /_includes/restore-openstack-from-a-backup.rest
+        cat << EOF > localhost-restore.yaml
+        ---
+        ansible_become_pass: "<admin_password>"
+        admin_password: "<admin_password>"
+        initial_backup_dir: "<location_of_backup_filename>"
+        backup_filename: "<openstack_tgz_backup_filename>"
+        restore_openstack_continue="true"
+        ...
+        EOF