瀏覽代碼

Fix order for invoking the hostpath storage task for registry

When attempting to using the hostpath storage for the registry for
an all-in-one setup, the playbook would fail due to an ordering issue
that caused it to not be able to correctly wait for the pods to come
online after configuring.

This change moves it to the correct place, and unbreaks hostpath storage
for all-in-one PoC configurations.
Neal Gompa 6 年之前
父節點
當前提交
38006625fb
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 0 4
      roles/openshift_hosted/tasks/registry.yml
  2. 4 0
      roles/openshift_hosted/tasks/registry_storage.yml

+ 0 - 4
roles/openshift_hosted/tasks/registry.yml

@@ -101,7 +101,3 @@
     volume_mounts: "{{ openshift_hosted_registry_volumes }}"
     edits: "{{ openshift_hosted_registry_edits }}"
     force: "{{ True|bool in openshift_hosted_registry_force }}"
-
-- include_tasks: storage/hostpath.yml
-  when:
-  - openshift_hosted_registry_storage_kind | default(none) in ['hostpath']

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

@@ -3,6 +3,10 @@
   when:
   - openshift_hosted_registry_storage_kind | default(none) == 'glusterfs' or openshift_hosted_registry_storage_glusterfs_swap
 
+- include_tasks: storage/hostpath.yml
+  when:
+  - openshift_hosted_registry_storage_kind | default(none) in ['hostpath']
+
 - when:
   - openshift_hosted_registry_storage_kind | default(none) == 'nfs'
   block: