Преглед на файлове

dynamic inventory bug when group exists but its empty

Mangirdas преди 7 години
родител
ревизия
ac122861b8
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 1 1
      roles/openshift_hosted/tasks/storage/glusterfs.yml
  2. 1 1
      roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml

Файловите разлики са ограничени, защото са твърде много
+ 1 - 1
roles/openshift_hosted/tasks/storage/glusterfs.yml


+ 1 - 1
roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml

@@ -48,7 +48,7 @@
     glusterfs_heketi_ssh_sudo: "{{ openshift_storage_glusterfs_registry_heketi_ssh_sudo | bool }}"
     glusterfs_heketi_ssh_keyfile: "{{ openshift_storage_glusterfs_registry_heketi_ssh_keyfile }}"
     glusterfs_heketi_fstab: "{{ openshift_storage_glusterfs_registry_heketi_fstab }}"
-    glusterfs_nodes: "{% if groups.glusterfs_registry is defined %}{% set nodes = groups.glusterfs_registry %}{% elif 'groups.glusterfs' is defined %}{% set nodes = groups.glusterfs %}{% else %}{% set nodes = '[]' %}{% endif %}{{ nodes }}"
+    glusterfs_nodes: "{% if groups.glusterfs_registry is defined and groups['glusterfs_registry'] | length > 0 %}{% set nodes = groups.glusterfs_registry %}{% elif 'groups.glusterfs' is defined and groups['glusterfs'] | length > 0 %}{% set nodes = groups.glusterfs %}{% else %}{% set nodes = '[]' %}{% endif %}{{ nodes }}"
 
 - include_tasks: glusterfs_common.yml
   when: