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 e0ec6f5b75
)
This commit is contained in:
parent
b25af6fdc6
commit
62c6f72116
|
@ -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 }}"
|
||||
|
|
Loading…
Reference in New Issue