瀏覽代碼

Merge pull request #9271 from bparees/nfs_registry

allow NFS to be used for registry without marking cluster unsupported
Scott Dodson 6 年之前
父節點
當前提交
11e50ce624
共有 2 個文件被更改,包括 10 次插入1 次删除
  1. 0 1
      roles/lib_utils/action_plugins/sanity_checks.py
  2. 10 0
      roles/openshift_hosted/tasks/registry_storage.yml

+ 0 - 1
roles/lib_utils/action_plugins/sanity_checks.py

@@ -51,7 +51,6 @@ RELEASE_REGEX = {'re': '(^v?\\d+(\\.\\d+(\\.\\d+)?)?$)',
                  'error_msg': RELEASE_REGEX_ERROR}
 
 STORAGE_KIND_TUPLE = (
-    'openshift_hosted_registry_storage_kind',
     'openshift_loggingops_storage_kind',
     'openshift_logging_storage_kind',
     'openshift_metrics_storage_kind',

+ 10 - 0
roles/openshift_hosted/tasks/registry_storage.yml

@@ -2,3 +2,13 @@
 - include_tasks: storage/glusterfs.yml
   when:
   - openshift_hosted_registry_storage_kind | default(none) == 'glusterfs' or openshift_hosted_registry_storage_glusterfs_swap
+
+- when:
+  - openshift_hosted_registry_storage_kind | default(none) == 'nfs'
+  block:
+  - name: Set warning about NFS not being recommended
+    run_once: true
+    set_stats:
+      data:
+        installer_phase_hosted:
+          message: "The use of NFS for the core OpenShift Container Platform components is not recommended, as NFS (and the NFS Protocol) does not provide the proper consistency needed for the applications that make up the OpenShift Container Platform infrastructure."