openstack/kolla-ansible
Code Issues Proposed changes

Fix wrong condition for iscsid container

Browse Source 
Iscsid is not only needed by cinder lvm backend, but also by ironic
conductor container.

Change-Id: I903cda88ca71ba31b30c220761f33808495aba72
Closes-Bug: #1709809
This commit is contained in:
guochao 2017-08-09 11:34:33 +08:00 committed by jimmygc
parent 3f6eaefeaf
commit ee66b6468d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,8 +4,8 @@
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 when: ( ( inventory_hostname in groups['compute'] or inventory_hostname in groups['cinder-volume'] ) and enable_cinder_backend_lvm | bool )
inventory_hostname in groups['storage'] or ( inventory_hostname in groups['ironic-conductor'] and enable_ironic | bool )
with_items: with_items:
- "iscsid" - "iscsid"
@ -13,8 +13,8 @@
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 when: ( ( inventory_hostname in groups['compute'] or inventory_hostname in groups['cinder-volume'] ) and enable_cinder_backend_lvm | bool )
inventory_hostname in groups['storage'] or ( inventory_hostname in groups['ironic-conductor'] and enable_ironic | bool )
with_items: with_items:
- "iscsid" - "iscsid"

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

@ -18,8 +18,8 @@
- "/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 when: ( ( inventory_hostname in groups['compute'] or inventory_hostname in groups['cinder-volume'] ) and enable_cinder_backend_lvm | bool )
inventory_hostname in groups['storage'] or ( inventory_hostname in groups['ironic-conductor'] and enable_ironic | bool )
- name: Starting tgtd container - name: Starting tgtd container
kolla_docker: kolla_docker: