Skip to content

Commit

Permalink
salt: generate containerd configuration before install
Browse files Browse the repository at this point in the history
Set the containerd configuration generation as
a requisite for containerd package installation, to
avoid having to restart the service just after its
installation.
  • Loading branch information
alexandre-allard committed Dec 18, 2019
1 parent 6bb7e52 commit b7cbbc3
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions salt/metalk8s/container-engine/containerd/installed.sls
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ Install containerd:
- require:
- test: Repositories configured
- metalk8s_package_manager: Install runc
- file: Create containerd service drop-in
- file: Configure registry IP in containerd conf
{%- if grains['os_family'].lower() == 'redhat' %}
- metalk8s_package_manager: Install container-selinux
{%- endif %}
Expand Down Expand Up @@ -60,8 +62,6 @@ Create containerd service drop-in:
HTTPS_PROXY={{ proxies.https }}
{%- endif %}
{%- endif %}
- require:
- metalk8s_package_manager: Install containerd
Install and configure cri-tools:
{{ pkg_installed('cri-tools') }}
Expand All @@ -85,5 +85,3 @@ Configure registry IP in containerd conf:
- contents: |
[plugins.cri.registry.mirrors."{{ repo.registry_endpoint }}"]
endpoint = ["http://{{ registry_ip }}:{{ registry_port }}"]
- require:
- metalk8s_package_manager: Install containerd

0 comments on commit b7cbbc3

Please sign in to comment.