From b889a6a0bb43c3ef3c72b6c1ee4661690b301808 Mon Sep 17 00:00:00 2001 From: M Camp Date: Thu, 18 Mar 2021 13:23:24 +0000 Subject: [PATCH] Revert "Fix devices name in values.yaml for rook-ceph-apps" This reverts commit 8192a74926f67c19ab513d9cba102d710efa2345. Reason for revert: Wait for technical reviewers +1 Change-Id: I7409832da4021bbed244eca884df1dd4fb8011a9 --- .../bare_metal/aio_duplex_install_kubernetes.rst | 7 +++---- .../bare_metal/aio_simplex_install_kubernetes.rst | 5 ++--- .../bare_metal/rook_storage_install_kubernetes.rst | 4 ++-- .../r5_release/virtual/aio_duplex_install_kubernetes.rst | 7 +++---- .../r5_release/virtual/aio_simplex_install_kubernetes.rst | 5 ++--- .../r5_release/virtual/rook_storage_install_kubernetes.rst | 4 ++-- 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/doc/source/deploy_install_guides/r5_release/bare_metal/aio_duplex_install_kubernetes.rst b/doc/source/deploy_install_guides/r5_release/bare_metal/aio_duplex_install_kubernetes.rst index 028efbfa8..ebcd9754d 100644 --- a/doc/source/deploy_install_guides/r5_release/bare_metal/aio_duplex_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/r5_release/bare_metal/aio_duplex_install_kubernetes.rst @@ -538,8 +538,7 @@ On **virtual** controller-0 and controller-1: $ system host-disk-wipe -s --confirm controller-0 /dev/sdb $ system host-disk-wipe -s --confirm controller-1 /dev/sdb -#. Edit values.yaml for rook-ceph-apps. - + values.yaml for rook-ceph-apps. :: cluster: @@ -547,10 +546,10 @@ On **virtual** controller-0 and controller-1: nodes: - name: controller-0 devices: - - name: sdb + - name: /dev/disk/by-path/pci-0000:00:03.0-ata-2.0 - name: controller-1 devices: - - name: sdb + - name: /dev/disk/by-path/pci-0000:00:03.0-ata-2.0 :: diff --git a/doc/source/deploy_install_guides/r5_release/bare_metal/aio_simplex_install_kubernetes.rst b/doc/source/deploy_install_guides/r5_release/bare_metal/aio_simplex_install_kubernetes.rst index b385a38bb..6df511b3b 100644 --- a/doc/source/deploy_install_guides/r5_release/bare_metal/aio_simplex_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/r5_release/bare_metal/aio_simplex_install_kubernetes.rst @@ -473,8 +473,7 @@ On **virtual** controller-0: system host-disk-wipe -s --confirm controller-0 /dev/sdb -#. Edit values.yaml for rook-ceph-apps. - + values.yaml for rook-ceph-apps. :: cluster: @@ -482,7 +481,7 @@ On **virtual** controller-0: nodes: - name: controller-0 devices: - - name: sdb + - name: /dev/disk/by-path/pci-0000:00:03.0-ata-2.0 :: diff --git a/doc/source/deploy_install_guides/r5_release/bare_metal/rook_storage_install_kubernetes.rst b/doc/source/deploy_install_guides/r5_release/bare_metal/rook_storage_install_kubernetes.rst index 860f07484..93719d47d 100644 --- a/doc/source/deploy_install_guides/r5_release/bare_metal/rook_storage_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/r5_release/bare_metal/rook_storage_install_kubernetes.rst @@ -688,10 +688,10 @@ On host storage-0 and storage-1: nodes: - name: storage-0 devices: - - name: sdb + - name: /dev/disk/by-path/pci-0000:00:03.0-ata-2.0 - name: storage-1 devices: - - name: sdb + - name: /dev/disk/by-path/pci-0000:00:03.0-ata-2.0 #. Update rook-ceph-apps override value. diff --git a/doc/source/deploy_install_guides/r5_release/virtual/aio_duplex_install_kubernetes.rst b/doc/source/deploy_install_guides/r5_release/virtual/aio_duplex_install_kubernetes.rst index 98bd982e3..dfa5c301d 100644 --- a/doc/source/deploy_install_guides/r5_release/virtual/aio_duplex_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/r5_release/virtual/aio_duplex_install_kubernetes.rst @@ -527,8 +527,7 @@ On **virtual** controller-0 and controller-1: $ system host-disk-wipe -s --confirm controller-0 /dev/sdb $ system host-disk-wipe -s --confirm controller-1 /dev/sdb -#. Edit values.yaml for rook-ceph-apps. - + values.yaml for rook-ceph-apps. :: cluster: @@ -536,10 +535,10 @@ On **virtual** controller-0 and controller-1: nodes: - name: controller-0 devices: - - name: sdb + - name: /dev/disk/by-path/pci-0000:00:03.0-ata-2.0 - name: controller-1 devices: - - name: sdb + - name: /dev/disk/by-path/pci-0000:00:03.0-ata-2.0 :: diff --git a/doc/source/deploy_install_guides/r5_release/virtual/aio_simplex_install_kubernetes.rst b/doc/source/deploy_install_guides/r5_release/virtual/aio_simplex_install_kubernetes.rst index 951591c62..e4d90b8ff 100644 --- a/doc/source/deploy_install_guides/r5_release/virtual/aio_simplex_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/r5_release/virtual/aio_simplex_install_kubernetes.rst @@ -373,8 +373,7 @@ On **virtual** controller-0: $ system host-disk-wipe -s --confirm controller-0 /dev/sdb -#. Edit values.yaml for rook-ceph-apps. - + values.yaml for rook-ceph-apps. :: cluster: @@ -382,7 +381,7 @@ On **virtual** controller-0: nodes: - name: controller-0 devices: - - name: sdb + - name: /dev/disk/by-path/pci-0000:00:03.0-ata-2.0 :: diff --git a/doc/source/deploy_install_guides/r5_release/virtual/rook_storage_install_kubernetes.rst b/doc/source/deploy_install_guides/r5_release/virtual/rook_storage_install_kubernetes.rst index 1b207262d..9f46c180c 100644 --- a/doc/source/deploy_install_guides/r5_release/virtual/rook_storage_install_kubernetes.rst +++ b/doc/source/deploy_install_guides/r5_release/virtual/rook_storage_install_kubernetes.rst @@ -499,10 +499,10 @@ On virtual storage-0 and storage-1: nodes: - name: rook-storage-0 devices: - - name: sdb + - name: /dev/disk/by-path/pci-0000:00:03.0-ata-2.0 - name: rook-storage-1 devices: - - name: sdb + - name: /dev/disk/by-path/pci-0000:00:03.0-ata-2.0 #. Update rook-ceph-apps override value.