fix(k3s): fix k3s's private-registry configuration not exist

fix k3s's private-registry configuration not exist
This commit is contained in:
赵安家 2021-05-07 18:29:01 +08:00
parent c9e2b619d1
commit 075ef165c5
1 changed files with 8 additions and 9 deletions

View File

@ -29,15 +29,6 @@
- ('docker' in k3s_runtime_config and k3s_runtime_config.docker)
- ('rootless' not in k3s_runtime_config or not k3s_runtime_config.rootless)
- name: Ensure containerd installation tasks are run
block:
- include_tasks: build/containerd/registries.yml
when:
- k3s_registries is defined
- (k3s_runtime_config.docker is not defined or not k3s_runtime_config.docker)
- ('rootless' not in k3s_runtime_config or not k3s_runtime_config.rootless)
- name: Flush Handlers
meta: flush_handlers
@ -50,6 +41,14 @@
- import_tasks: build/install-k3s.yml
- name: Ensure containerd installation tasks are run
block:
- include_tasks: build/containerd/registries.yml
when:
- k3s_registries is defined
- (k3s_runtime_config.docker is not defined or not k3s_runtime_config.docker)
- ('rootless' not in k3s_runtime_config or not k3s_runtime_config.rootless)
- include_tasks: validate/configuration/cluster-init.yml
when:
- k3s_control_delegate is defined