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:
Markos Chandras
2019-04-09 08:17:05 +01:00
committed by Kubernetes Prow Robot
parent 35c0010876
commit 12c6b5c3eb
8 changed files with 16 additions and 9 deletions

View File

@@ -151,7 +151,7 @@
pkg: "{{item.name}}"
force: "{{item.force|default(omit)}}"
conf_file: "{{item.yum_conf|default(omit)}}"
state: present
state: "{{item.state | default('present')}}"
update_cache: "{{ omit if ansible_distribution == 'Fedora' else True }}"
register: docker_task_result
until: docker_task_result is succeeded
@@ -166,7 +166,7 @@
action: "{{ docker_package_info.pkg_mgr }}"
args:
name: "{{ item.name }}"
state: present
state: "{{item.state | default('present')}}"
with_items: "{{ docker_package_info.pkgs }}"
register: docker_task_result
until: docker_task_result is succeeded

View File

@@ -5,6 +5,8 @@ docker_package_info:
pkg_mgr: zypper
pkgs:
- name: docker
- name: containerd
state: latest
docker_repo_key_info:
pkg_key: ''