Merge "Ensure cinder LVM volumes work after system restart"
This commit is contained in:
commit
8e81dd0460
|
@ -76,6 +76,7 @@ parameters:
|
|||
|
||||
conditions:
|
||||
|
||||
cinder_iscsi_backend_enabled: {equals: [{get_param: CinderEnableIscsiBackend}, true]}
|
||||
multipathd_enabled: {equals: [{get_param: MultipathdEnable}, true]}
|
||||
cvol_active_active_tls_enabled:
|
||||
and:
|
||||
|
@ -130,7 +131,7 @@ outputs:
|
|||
-
|
||||
- name: cinder_enable_iscsi_backend fact
|
||||
set_fact:
|
||||
cinder_enable_iscsi_backend: {get_param: CinderEnableIscsiBackend}
|
||||
cinder_enable_iscsi_backend: {if: [cinder_iscsi_backend_enabled, true, false]}
|
||||
- when: cinder_enable_iscsi_backend|bool
|
||||
block:
|
||||
- name: ensure LVM rpm dependencies are installed
|
||||
|
@ -180,9 +181,9 @@ outputs:
|
|||
Description=Cinder LVM losetup
|
||||
DefaultDependencies=no
|
||||
Conflicts=umount.target
|
||||
Requires=systemd-udev-settle.service
|
||||
Requires=lvm2-monitor.service systemd-udev-settle.service
|
||||
Before=local-fs.target umount.target
|
||||
After=systemd-udev-settle.service
|
||||
After=var.mount lvm2-monitor.service systemd-udev-settle.service
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
|
@ -216,6 +217,11 @@ outputs:
|
|||
- /sys:/sys
|
||||
- /var/lib/cinder:/var/lib/cinder:z
|
||||
- /var/lib/iscsi:/var/lib/iscsi:z
|
||||
-
|
||||
if:
|
||||
- cinder_iscsi_backend_enabled
|
||||
- - /etc/target:/etc/target:z
|
||||
- []
|
||||
-
|
||||
if:
|
||||
- multipathd_enabled
|
||||
|
|
|
@ -142,20 +142,20 @@ outputs:
|
|||
- /sys:/sys
|
||||
- /lib/modules:/lib/modules:ro
|
||||
- /etc/iscsi:/var/lib/kolla/config_files/src-iscsid:ro
|
||||
- /etc/target:/etc/target:z
|
||||
- /var/lib/iscsi:/var/lib/iscsi:z
|
||||
environment:
|
||||
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
|
||||
host_prep_tasks:
|
||||
- name: ensure /etc/iscsi exists
|
||||
- name: create persistent directories
|
||||
file:
|
||||
path: /etc/iscsi
|
||||
path: "{{ item.path }}"
|
||||
state: directory
|
||||
setype: container_file_t
|
||||
- name: ensure /var/lib/iscsi exists
|
||||
file:
|
||||
path: /var/lib/iscsi
|
||||
state: directory
|
||||
setype: container_file_t
|
||||
setype: "{{ item.setype }}"
|
||||
with_items:
|
||||
- { 'path': /etc/iscsi, 'setype': container_file_t }
|
||||
- { 'path': /etc/target, 'setype': container_file_t }
|
||||
- { 'path': /var/lib/iscsi, 'setype': container_file_t }
|
||||
- name: stat /lib/systemd/system/iscsid.socket
|
||||
stat: path=/lib/systemd/system/iscsid.socket
|
||||
register: stat_iscsid_socket
|
||||
|
|
Loading…
Reference in New Issue