starlingx/stx-puppet
Code Issues Proposed changes

Remove docker registry default setting in containerd config file

Browse Source 
Docker registry is configured as secure registry in default in
config.toml. User may config docker registry as insecure registry
in localhost.yml, and lead to configuration conflict. Remove the
default setting in config.toml to solve it.

Closes-Bug: 1863144

Change-Id: I4b3b3e1095f10a9ce2e92a3c84330dab1af3f895
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
This commit is contained in:
Shuicheng Lin 2020-02-17 10:59:24 +08:00
parent 1b620e83c6
commit 980eae4a86
1 changed files with 0 additions and 2 deletions

2
puppet-manifests/src/modules/platform/templates/config.toml.erb

@ -78,8 +78,6 @@ oom_score = 0
conf_template = ""
[plugins.cri.registry]
[plugins.cri.registry.mirrors]
[plugins.cri.registry.mirrors."docker.io"]
endpoint = ["https://registry-1.docker.io"]
# Begin of insecure registries
<%- @insecure_registries.each do |insecure_registry| -%>
[plugins.cri.registry.mirrors."<%= insecure_registry %>"]