소스 검색

Merge pull request #4926 from jarrpa/glusterfs-mixed-namespace

GlusterFS: Use default namespace when not native.
Scott Dodson 7 년 전
부모
커밋
8bf8f395ac
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      roles/openshift_storage_glusterfs/defaults/main.yml

+ 1 - 1
roles/openshift_storage_glusterfs/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 openshift_storage_glusterfs_timeout: 300
-openshift_storage_glusterfs_namespace: 'glusterfs'
+openshift_storage_glusterfs_namespace: "{{ 'glusterfs' | quote if glusterfs_is_native or glusterfs_heketi_is_native else 'default' | quote }}"
 openshift_storage_glusterfs_is_native: True
 openshift_storage_glusterfs_name: 'storage'
 openshift_storage_glusterfs_nodeselector: "glusterfs={{ openshift_storage_glusterfs_name }}-host"