From 6271bb316b389a69780c3b8cc8d1a78caefc74b7 Mon Sep 17 00:00:00 2001
From: Ivan Pchelintsev <Ivan.Pchelintsev@dell.com>
Date: Thu, 24 Oct 2019 16:05:08 +0300
Subject: [PATCH] Fix VxFlexOS documentation

Remove unnecessary instructions for containerized deployment
using VxFlex OS driver. Old instructions are not working and
will not be applicable after the bug will be resolved.

Change-Id: I16319ab394e75cbe5d8898afcb1d1043f898f315
Closes-Bug: #1846483
---
 .../drivers/dell-emc-vxflex-driver.rst        | 112 +-----------------
 1 file changed, 2 insertions(+), 110 deletions(-)

diff --git a/doc/source/configuration/block-storage/drivers/dell-emc-vxflex-driver.rst b/doc/source/configuration/block-storage/drivers/dell-emc-vxflex-driver.rst
index 69d936fa99d..70df49c4b01 100644
--- a/doc/source/configuration/block-storage/drivers/dell-emc-vxflex-driver.rst
+++ b/doc/source/configuration/block-storage/drivers/dell-emc-vxflex-driver.rst
@@ -344,113 +344,5 @@ Using VxFlex OS Storage with a containerized overcloud
 ------------------------------------------------------
 
 When using a containerized overcloud, such as one deployed via TripleO or
-Red Hat OpenStack version 12 and above, there is an additional step that must
-be performed.
-
-Before deploying the overcloud
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-After ensuring that the Storage Data Client (SDC) is installed on all nodes and
-before deploying the overcloud,
-modify the TripleO Heat Template for the nova-compute and cinder-volume
-containers to add volume mappings for directories containing the SDC
-components. These files can normally
-be found at
-``/usr/share/openstack-tripleo-heat-templates/docker/services/nova-compute.yaml``
-and
-``/usr/share/openstack-tripleo-heat-templates/docker/services/cinder-volume.yaml``
-
-Two lines need to be inserted into the list of mapped volumes in each
-container.
-
-.. code-block:: yaml
-
-  /opt/emc/scaleio:/opt/emc/scaleio
-  /bin/emc/scaleio:/bin/emc/scaleio
-
-.. end
-
-The changes to the two heat templates are identical, as an example
-the original nova-compute file should have section that resembles the
-following:
-
-.. code-block:: yaml
-
-  ...
-  docker_config:
-    step_4:
-      nova_compute:
-        image: &nova_compute_image {get_param: DockerNovaComputeImage}
-        ipc: host
-        net: host
-        privileged: true
-        user: nova
-        restart: always
-        volumes:
-          list_concat:
-            - {get_attr: [ContainersCommon, volumes]}
-            -
-              - /var/lib/kolla/config_files/nova_compute.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro
-              - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
-              - /dev:/dev
-              - /lib/modules:/lib/modules:ro
-              - /etc/iscsi:/etc/iscsi
-              - /run:/run
-              - /var/lib/nova:/var/lib/nova:shared
-              - /var/lib/libvirt:/var/lib/libvirt
-              - /var/log/containers/nova:/var/log/nova
-              - /sys/class/net:/sys/class/net
-              - /sys/bus/pci:/sys/bus/pci
-        environment:
-         - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-  ...
-
-.. end
-
-After modifying the nova-compute file, the section should resemble:
-
-.. code-block:: yaml
-
-  ...
-  docker_config:
-    step_4:
-      nova_compute:
-        image: &nova_compute_image {get_param: DockerNovaComputeImage}
-        ipc: host
-        net: host
-        privileged: true
-        user: nova
-        restart: always
-        volumes:
-          list_concat:
-            - {get_attr: [ContainersCommon, volumes]}
-            -
-              - /var/lib/kolla/config_files/nova_compute.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro
-              - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro
-              - /dev:/dev
-              - /lib/modules:/lib/modules:ro
-              - /etc/iscsi:/etc/iscsi
-              - /run:/run
-              - /var/lib/nova:/var/lib/nova:shared
-              - /var/lib/libvirt:/var/lib/libvirt
-              - /var/log/containers/nova:/var/log/nova
-              - /sys/class/net:/sys/class/net
-              - /sys/bus/pci:/sys/bus/pci
-              - /opt/emc/scaleio:/opt/emc/scaleio
-              - /bin/emc/scaleio:/bin/emc/scaleio
-        environment:
-         - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
-  ...
-
-.. end
-
-Once the nova-compute file is modified, make an identical change to the
-cinder-volume file.
-
-
-Deploy the overcloud
-~~~~~~~~~~~~~~~~~~~~
-
-Once the above changes have been made, deploy the overcloud as usual.
+Red Hat OpenStack version 13 and above, install the Storage Data Client
+(SDC) on all nodes after deploying the overcloud.