mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-01 09:38:12 -03:30
openSUSE: Use Leap 15.0 instead of 42.3 (#4442)
* Vagrantfile: Bump openSUSE to Leap 15.0 * roles: container-engine: Add 'containerd' package for openSUSE The 'containerd' package contains the docker-containerd and docker-containerd-shim binaries. We also need to ensure that the latest version is installed since an older version may already be present (eg GCE images) * Remove docker log-opts for opensuse * roles: bootstrap-os: Use lowercase 'o' for openSUSE OpenSUSE is not a valid family name. The correct one is openSUSE * roles: bootstrap-os: Update zypper cache before first installation The zypper cache may be outdated so ensure that it's fully updated before we try and install the bootstrap packages.
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
35c0010876
commit
12c6b5c3eb
@@ -59,9 +59,9 @@ docker_options: >-
|
||||
{{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }}
|
||||
{%- endif %}
|
||||
{%- if docker_version != "latest" and docker_version is version('17.05', '<') %}
|
||||
--graph={{ docker_daemon_graph }} {{ docker_log_opts }}
|
||||
--graph={{ docker_daemon_graph }} {% if ansible_os_family not in ["openSUSE Leap", "openSUSE Tumbleweed", "Suse"] %}{{ docker_log_opts }}{% endif %}
|
||||
{%- else %}
|
||||
--data-root={{ docker_daemon_graph }} {{ docker_log_opts }}
|
||||
--data-root={{ docker_daemon_graph }} {% if ansible_os_family not in ["openSUSE Leap", "openSUSE Tumbleweed", "Suse"] %}{{ docker_log_opts }}{% endif %}
|
||||
{%- endif %}
|
||||
{%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %}
|
||||
--add-runtime docker-runc=/usr/libexec/docker/docker-runc-current
|
||||
|
||||
Reference in New Issue
Block a user