diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-16 20:19:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-16 20:19:42 +0000 |
| commit | d75847772d0e880329eef5867caf4b87035d2ae0 (patch) | |
| tree | 87e230f50f8ec94493b165c74339db0b32a49b60 | |
| parent | ff14e6ec069775405af6024bbbf05ffb5796aa14 (diff) | |
| parent | da8ce56cc6a87d190639cfb4955eb4d24d76d28b (diff) | |
| download | kolla-d75847772d0e880329eef5867caf4b87035d2ae0.tar.gz kolla-d75847772d0e880329eef5867caf4b87035d2ae0.zip | |
Merge "Cinder-backup fails while backing up iSCSI volumes"
| -rw-r--r-- | ansible/roles/cinder/tasks/start.yml | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/ansible/roles/cinder/tasks/start.yml b/ansible/roles/cinder/tasks/start.yml index d80eee31c..335850328 100644 --- a/ansible/roles/cinder/tasks/start.yml +++ b/ansible/roles/cinder/tasks/start.yml @@ -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'] |