Merge pull request #25 from puzhihao/puzhihao01

修改containerd配置文件jinja2 globals.yml添加全局变量
pixiu-io · May 29, 2024 · 886b731 · 886b731
2 parents cca02e3 + ebffa46
commit 886b731
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ansible/roles/baremetal/templates/config.toml.j2 b/ansible/roles/baremetal/templates/config.toml.j2
@@ -147,14 +147,14 @@ version = 2
       [plugins."io.containerd.grpc.v1.cri".registry.auths]
 
       [plugins."io.containerd.grpc.v1.cri".registry.configs]
-        [plugins."io.containerd.grpc.v1.cri".registry.configs."{{ image_repository_daemon }}".tls]
+        [plugins."io.containerd.grpc.v1.cri".registry.configs."{{ image_repository_container }}".tls]
           insecure_skip_verify = false
 
       [plugins."io.containerd.grpc.v1.cri".registry.headers]
 
       [plugins."io.containerd.grpc.v1.cri".registry.mirrors]
-        [plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{ image_repository_daemon }}"]
-          endpoint = ["{{ image_repository_daemon }}"]
+        [plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{ image_repository_container }}"]
+          endpoint = ["http://{{ image_repository_container }}"]
 
     [plugins."io.containerd.grpc.v1.cri".x509_key_pair_streaming]
       tls_cert_file = ""

diff --git a/etc/kubez/globals.yml b/etc/kubez/globals.yml
@@ -31,6 +31,7 @@ image_repository: "192.168.16.210:58001/pixiuio"
 yum_baseurl: "http://192.168.16.210:58000/repository/pixiuio-centos"
 
 image_repository_daemon: "0.0.0.0/0"
+image_repository_container: "192.168.16.210:58001"
 
 ##################
 # Runtime Options