Home Explore Help
Register Sign In
shixiong
/
okd
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

dynamic inventory bug when group exists but its empty

Mangirdas 7 years ago
parent
1a58f7fc76
commit
ac122861b8
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      roles/openshift_hosted/tasks/storage/glusterfs.yml
  2. 1 1
      roles/openshift_storage_glusterfs/tasks/glusterfs_registry.yml

File diff suppressed because it is too large
+ 1 - 1
roles/openshift_hosted/tasks/storage/glusterfs.yml


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

@@ -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: