Merge "Cinder-backup fails while backing up iSCSI volumes"
This commit is contained in:
commit
d75847772d
@ -23,9 +23,9 @@
|
||||
- "kolla_logs:/var/log/kolla/"
|
||||
when: inventory_hostname in groups['cinder-scheduler']
|
||||
|
||||
- name: Prepare volumes list
|
||||
- name: Prepare volumes list for cinder-volume
|
||||
set_fact:
|
||||
mounts:
|
||||
cinder_volume_mounts:
|
||||
- "{{ node_config_directory }}/cinder-volume/:{{ container_config_directory }}/:ro"
|
||||
- "/etc/localtime:/etc/localtime:ro"
|
||||
- "/dev/:/dev/"
|
||||
@ -42,9 +42,20 @@
|
||||
image: "{{ cinder_volume_image_full }}"
|
||||
privileged: True
|
||||
ipc_mode: "host"
|
||||
volumes: '{{ mounts | reject("equalto", "") | list}}'
|
||||
volumes: '{{ cinder_volume_mounts | reject("equalto", "") | list}}'
|
||||
when: inventory_hostname in groups['cinder-volume']
|
||||
|
||||
- name: Prepare volumes list for cinder-backup
|
||||
set_fact:
|
||||
cinder_backup_mounts:
|
||||
- "{{ node_config_directory }}/cinder-backup/:{{ container_config_directory }}/:ro"
|
||||
- "/etc/localtime:/etc/localtime:ro"
|
||||
- "/dev/:/dev/"
|
||||
- "/run/:/run/"
|
||||
- "{% if enable_cinder_backend_lvm | bool %}cinder:/var/lib/cinder{% endif %}"
|
||||
- "{% if enable_cinder_backend_lvm | bool %}iscsi_info:/etc/iscsi{% endif %}"
|
||||
- "kolla_logs:/var/log/kolla/"
|
||||
|
||||
- name: Starting cinder-backup container
|
||||
kolla_docker:
|
||||
action: "start_container"
|
||||
@ -52,9 +63,5 @@
|
||||
name: "cinder_backup"
|
||||
image: "{{ cinder_backup_image_full }}"
|
||||
privileged: True
|
||||
volumes:
|
||||
- "{{ node_config_directory }}/cinder-backup/:{{ container_config_directory }}/:ro"
|
||||
- "/etc/localtime:/etc/localtime:ro"
|
||||
- "/dev/mapper/:/dev/mapper/"
|
||||
- "kolla_logs:/var/log/kolla/"
|
||||
volumes: '{{ cinder_backup_mounts | reject("equalto", "") | list}}'
|
||||
when: inventory_hostname in groups['cinder-backup']
|
||||
|
Loading…
Reference in New Issue
Block a user