From 62c6f721162475495d1fd662994066824b05bda4 Mon Sep 17 00:00:00 2001
From: Christian Schwede <cschwede@redhat.com>
Date: Fri, 15 Jun 2018 13:12:11 +0200
Subject: [PATCH] Fix Swift storage device setup

The formerly extra puppet parameter "base_dir" has been ignored when
switching to a containerized overcloud, which broke support for
non-default device path - for example when using multipath devices.

Closes-Bug: 1777116
Change-Id: If60479998a9f02393c0d49d1b752b9ef4f8f9aff
(cherry picked from commit e0ec6f5b75f0662b7c0241a9a12dc3743ceec8cf)
---
 docker/services/swift-storage.yaml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index b6d93d0101..464dd53071 100644
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -445,28 +445,25 @@ outputs:
             src: /var/log/swift
             dest: /var/log/containers/swift
             state: link
+        - name: Set fact for SwiftRawDisks
+          set_fact:
+            swift_raw_disks: {get_param: SwiftRawDisks}
         - name: Format SwiftRawDisks
           filesystem:
             fstype: xfs
-            dev: /dev/{{ item }}
+            dev: "{{ swift_raw_disks[item]['base_dir']|default('/dev') }}/{{ item }}"
             opts: -f -i size=1024
-          with_items:
-            - repeat:
-                template: 'DEVICE'
-                for_each:
-                  DEVICE: {get_param: SwiftRawDisks}
+          with_items: "{{ swift_raw_disks }}"
+          when: swift_raw_disks
         - name: Mount devices defined in SwiftRawDisks
           mount:
             name: /srv/node/{{ item }}
-            src: /dev/{{ item }}
+            src: "{{ swift_raw_disks[item]['base_dir']|default('/dev') }}/{{ item }}"
             fstype: xfs
             opts: noatime
             state: mounted
-          with_items:
-            - repeat:
-                template: 'DEVICE'
-                for_each:
-                  DEVICE: {get_param: SwiftRawDisks}
+          with_items: "{{ swift_raw_disks }}"
+          when: swift_raw_disks
       upgrade_tasks:
         - name: Check if swift storage services are deployed
           command: systemctl is-enabled --quiet "{{ item }}"