Merge "Fix Swift storage device setup" into stable/pike
This commit is contained in:
commit
909ce9eb85
|
@ -445,28 +445,25 @@ outputs:
|
||||||
src: /var/log/swift
|
src: /var/log/swift
|
||||||
dest: /var/log/containers/swift
|
dest: /var/log/containers/swift
|
||||||
state: link
|
state: link
|
||||||
|
- name: Set fact for SwiftRawDisks
|
||||||
|
set_fact:
|
||||||
|
swift_raw_disks: {get_param: SwiftRawDisks}
|
||||||
- name: Format SwiftRawDisks
|
- name: Format SwiftRawDisks
|
||||||
filesystem:
|
filesystem:
|
||||||
fstype: xfs
|
fstype: xfs
|
||||||
dev: /dev/{{ item }}
|
dev: "{{ swift_raw_disks[item]['base_dir']|default('/dev') }}/{{ item }}"
|
||||||
opts: -f -i size=1024
|
opts: -f -i size=1024
|
||||||
with_items:
|
with_items: "{{ swift_raw_disks }}"
|
||||||
- repeat:
|
when: swift_raw_disks
|
||||||
template: 'DEVICE'
|
|
||||||
for_each:
|
|
||||||
DEVICE: {get_param: SwiftRawDisks}
|
|
||||||
- name: Mount devices defined in SwiftRawDisks
|
- name: Mount devices defined in SwiftRawDisks
|
||||||
mount:
|
mount:
|
||||||
name: /srv/node/{{ item }}
|
name: /srv/node/{{ item }}
|
||||||
src: /dev/{{ item }}
|
src: "{{ swift_raw_disks[item]['base_dir']|default('/dev') }}/{{ item }}"
|
||||||
fstype: xfs
|
fstype: xfs
|
||||||
opts: noatime
|
opts: noatime
|
||||||
state: mounted
|
state: mounted
|
||||||
with_items:
|
with_items: "{{ swift_raw_disks }}"
|
||||||
- repeat:
|
when: swift_raw_disks
|
||||||
template: 'DEVICE'
|
|
||||||
for_each:
|
|
||||||
DEVICE: {get_param: SwiftRawDisks}
|
|
||||||
upgrade_tasks:
|
upgrade_tasks:
|
||||||
- name: Check if swift storage services are deployed
|
- name: Check if swift storage services are deployed
|
||||||
command: systemctl is-enabled --quiet "{{ item }}"
|
command: systemctl is-enabled --quiet "{{ item }}"
|
||||||
|
|
Loading…
Reference in New Issue