aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorMartin Matyáš <martinx.maty@intel.com>2016-10-04 08:04:57 -0700
committerMartin Matyáš <martinx.maty@intel.com>2016-10-13 10:10:16 -0700
commit157dc0f177ea3f4ff1901de37f9d17d183d6cb12 (patch)
tree9d603c1cea84d8faad56ea7a79064d028491ded0 /ansible
parentcac300e0c85ae2a6878e8a7b388da41b7584d282 (diff)
downloadkolla-157dc0f177ea3f4ff1901de37f9d17d183d6cb12.tar.gz
kolla-157dc0f177ea3f4ff1901de37f9d17d183d6cb12.zip
Make iscsi config.yml consistent with start.yml
As part of non-lvm iscsi bugfix, changes were introduced to iscsi's start.yml. Same changes/conditions should be reflected to config.yml so container configuration is deployed on the same nodes as containers are started. TrivialFix Change-Id: Ib988df2d36983d63a3aff4226224dc5fc6064221
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/iscsi/tasks/config.yml8
1 files changed, 6 insertions, 2 deletions
diff --git a/ansible/roles/iscsi/tasks/config.yml b/ansible/roles/iscsi/tasks/config.yml
index 4393db15f..0ebe3dd74 100644
--- a/ansible/roles/iscsi/tasks/config.yml
+++ b/ansible/roles/iscsi/tasks/config.yml
@@ -23,7 +23,9 @@
path: "{{ node_config_directory }}/{{ item }}"
state: "directory"
recurse: yes
- when: inventory_hostname in groups['tgtd']
+ when:
+ - inventory_hostname in groups['tgtd']
+ - enable_cinder_backend_lvm | bool
with_items:
- "tgtd"
@@ -31,6 +33,8 @@
template:
src: "{{ item }}.json.j2"
dest: "{{ node_config_directory }}/{{ item }}/config.json"
- when: inventory_hostname in groups['tgtd']
+ when:
+ - inventory_hostname in groups['tgtd']
+ - enable_cinder_backend_lvm | bool
with_items:
- "tgtd"