openstack/kolla-ansible
Code Issues Proposed changes

Merge "Check enable_cinder before deploy iscsi and tgtd"

Browse Source
This commit is contained in:
Zuul 2018-01-17 08:48:30 +00:00 committed by Gerrit Code Review
commit e8386f7fb2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/iscsi/tasks/config.yml
View File

@ -4,7 +4,7 @@
path: "{{ node_config_directory }}/{{ item }}" path: "{{ node_config_directory }}/{{ item }}"
state: "directory" state: "directory"
recurse: yes recurse: yes
when: ( ( inventory_hostname in groups['compute'] or inventory_hostname in groups['cinder-volume'] ) and enable_cinder_backend_iscsi | bool ) when: ( ( inventory_hostname in groups['compute'] or inventory_hostname in groups['cinder-volume'] ) and enable_cinder | bool and enable_cinder_backend_iscsi | bool )
or ( inventory_hostname in groups['ironic-conductor'] and enable_ironic | bool ) or ( inventory_hostname in groups['ironic-conductor'] and enable_ironic | bool )
with_items: with_items:
- "iscsid" - "iscsid"
@ -13,7 +13,7 @@
template: template:
src: "{{ item }}.json.j2" src: "{{ item }}.json.j2"
dest: "{{ node_config_directory }}/{{ item }}/config.json" dest: "{{ node_config_directory }}/{{ item }}/config.json"
when: ( ( inventory_hostname in groups['compute'] or inventory_hostname in groups['cinder-volume'] ) and enable_cinder_backend_iscsi | bool ) when: ( ( inventory_hostname in groups['compute'] or inventory_hostname in groups['cinder-volume'] ) and enable_cinder | bool and enable_cinder_backend_iscsi | bool )
or ( inventory_hostname in groups['ironic-conductor'] and enable_ironic | bool ) or ( inventory_hostname in groups['ironic-conductor'] and enable_ironic | bool )
with_items: with_items:
- "iscsid" - "iscsid"

3
ansible/roles/iscsi/tasks/start.yml
View File

@ -18,7 +18,7 @@
- "/sys/kernel/config:/configfs" - "/sys/kernel/config:/configfs"
- "cinder:/var/lib/cinder" - "cinder:/var/lib/cinder"
- "iscsi_info:/etc/iscsi" - "iscsi_info:/etc/iscsi"
when: ( ( inventory_hostname in groups['compute'] or inventory_hostname in groups['cinder-volume'] ) and enable_cinder_backend_iscsi | bool ) when: ( ( inventory_hostname in groups['compute'] or inventory_hostname in groups['cinder-volume'] ) and enable_cinder | bool and enable_cinder_backend_iscsi | bool )
or ( inventory_hostname in groups['ironic-conductor'] and enable_ironic | bool ) or ( inventory_hostname in groups['ironic-conductor'] and enable_ironic | bool )
- name: Starting tgtd container - name: Starting tgtd container
@ -42,4 +42,5 @@
- "iscsi_info:/etc/iscsi" - "iscsi_info:/etc/iscsi"
when: when:
- inventory_hostname in groups['tgtd'] - inventory_hostname in groups['tgtd']
- enable_cinder | bool
- enable_cinder_backend_lvm | bool - enable_cinder_backend_lvm | bool