Merge "Add the missing condition for config.yml"

ansible/roles/elasticsearch/tasks/config.yml

@@ -4,7 +4,9 @@
     path: "{{ node_config_directory }}/{{ item.key }}"
     state: "directory"
     recurse: yes
-  when: inventory_hostname in groups[item.value.group]
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
   with_dict: "{{ elasticsearch_services }}"
 
 - name: Copying over config.json files for services

ansible/roles/glance/tasks/config.yml

@@ -4,7 +4,9 @@
     path: "{{ node_config_directory }}/{{ item.key }}"
     state: "directory"
     recurse: yes
-  when: inventory_hostname in groups[item.value.group]
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
   with_dict: "{{ glance_services }}"
 
 - name: Copying over config.json files for services

ansible/roles/gnocchi/tasks/config.yml

@@ -4,7 +4,9 @@
     path: "{{ node_config_directory }}/{{ item.key }}"
     state: "directory"
     recurse: yes
-  when: inventory_hostname in groups[item.value.group]
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
   with_dict: "{{ gnocchi_services }}"
 
 - name: Copying over config.json files for services

ansible/roles/heat/tasks/config.yml

@@ -4,7 +4,9 @@
     path: "{{ node_config_directory }}/{{ item.key }}"
     state: "directory"
     recurse: yes
-  when: inventory_hostname in groups[item.value.group]
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
   with_dict: "{{ heat_services }}"
 
 - name: Copying over config.json files for services

ansible/roles/horizon/tasks/config.yml

@@ -4,7 +4,9 @@
     path: "{{ node_config_directory }}/{{ item.key }}"
     state: "directory"
     recurse: yes
-  when: inventory_hostname in groups[item.value.group]
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
   with_dict: "{{ horizon_services }}"
 
 - name: Copying over config.json files for services

ansible/roles/keystone/tasks/config.yml

@@ -14,7 +14,7 @@
     recurse: yes
   when:
     - inventory_hostname in groups[item.value.group]
-    - item.value.enabled
+    - item.value.enabled | bool
   with_dict: "{{ keystone_services }}"
 
 - name: Copying over config.json files for services
@@ -25,7 +25,7 @@
   with_dict: "{{ keystone_services }}"
   when:
     - inventory_hostname in groups[item.value.group]
-    - item.value.enabled
+    - item.value.enabled | bool
   notify:
     - Restart keystone container
     - Restart keystone-ssh container

ansible/roles/magnum/tasks/config.yml

@@ -4,7 +4,9 @@
     path: "{{ node_config_directory }}/{{ item.key }}"
     state: "directory"
     recurse: yes
-  when: inventory_hostname in groups[item.value.group]
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
   with_dict: "{{ magnum_services }}"
 
 - name: Copying over config.json files for services

ansible/roles/rally/tasks/config.yml

@@ -4,7 +4,9 @@
     path: "{{ node_config_directory }}/{{ item.key }}"
     state: "directory"
     recurse: yes
-  when: inventory_hostname in groups[item.value.group]
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
   with_dict: "{{ rally_services }}"
 
 - name: Copying over config.json files for services

ansible/roles/sahara/tasks/config.yml

@@ -4,7 +4,9 @@
     path: "{{ node_config_directory }}/{{ item.key }}"
     state: "directory"
     recurse: yes
-  when: inventory_hostname in groups[item.value.group]
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
   with_dict: "{{ sahara_services }}"
 
 - name: Copying over config.json files for services

ansible/roles/searchlight/tasks/config.yml

@@ -4,6 +4,9 @@
     path: "{{ node_config_directory }}/{{ item.key }}"
     state: "directory"
     recurse: yes
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
   with_dict: "{{ searchlight_services }}"
 
 - name: Copying over config.json files for services

ansible/roles/senlin/tasks/config.yml

@@ -4,7 +4,9 @@
     path: "{{ node_config_directory }}/{{ item.key }}"
     state: "directory"
     recurse: yes
-  when: inventory_hostname in groups[item.value.group]
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
   with_dict: "{{ senlin_services }}"
 
 - name: Copying over config.json files for services

ansible/roles/watcher/tasks/config.yml

@@ -4,7 +4,9 @@
     path: "{{ node_config_directory }}/{{ item.key }}"
     state: "directory"
     recurse: yes
-  when: inventory_hostname in groups[item.value.group]
+  when:
+    - inventory_hostname in groups[item.value.group]
+    - item.value.enabled | bool
   with_dict: "{{ watcher_services }}"
 
 - name: Copying over config.json files for services