From 28333d4513fdd89e0df63325b634bb7b0a1561cc Mon Sep 17 00:00:00 2001
From: Maxime Guyot <Miouge1@users.noreply.github.com>
Date: Tue, 28 Apr 2020 14:28:06 +0200
Subject: [PATCH] Fix crio runc path on Ubuntu (#6035)
---
CONTRIBUTING.md | 4 +++-
.../cri-o/molecule/default/molecule.yml | 14 ++++----------
roles/container-engine/cri-o/vars/ubuntu.yml | 2 +-
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fa1d8e9a1..0e3cb6143 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,9 @@ Kubespray uses `yamllint` and `ansible-lint`. To run them locally use `yamllint
#### Molecule
-[molecule](https://github.com/ansible-community/molecule) is designed to help the development and testing of Ansible roles. In Kubespray you can run it all for all roles with `./tests/scripts/molecule_run.sh` or for a specific role (that you are working with) with `cd roles/my-role && molecule test`
+[molecule](https://github.com/ansible-community/molecule) is designed to help the development and testing of Ansible roles. In Kubespray you can run it all for all roles with `./tests/scripts/molecule_run.sh` or for a specific role (that you are working with) with `molecule test` from the role directory (`cd roles/my-role`).
+
+When developing or debugging a role it can be useful to run `molecule create` and `molecule converge` separately. Then you can use `molecule login` to SSH into the test environment.
#### Vagrant
diff --git a/roles/container-engine/cri-o/molecule/default/molecule.yml b/roles/container-engine/cri-o/molecule/default/molecule.yml
index c4a1af9c8..06517b625 100644
--- a/roles/container-engine/cri-o/molecule/default/molecule.yml
+++ b/roles/container-engine/cri-o/molecule/default/molecule.yml
@@ -8,31 +8,25 @@ lint:
options:
config-file: ../../../.yamllint
platforms:
- - name: kubespray-crio-ubuntu
+ - name: ubuntu1804
box: generic/ubuntu1804
cpus: 2
memory: 1024
groups:
- kube-master
- - name: kubespray-crio-centos7
+ - name: centos7
box: centos/7
cpus: 2
memory: 1024
groups:
- kube-master
- - name: kubespray-crio-centos8
+ - name: centos8
box: centos/8
cpus: 2
memory: 1024
groups:
- kube-master
- - name: kubespray-crio-debian
- box: generic/debian10
- cpus: 2
- memory: 1024
- groups:
- - kube-master
- - name: kubespray-crio-fedora
+ - name: fedora
box: fedora/31-cloud-base
cpus: 2
memory: 1024
diff --git a/roles/container-engine/cri-o/vars/ubuntu.yml b/roles/container-engine/cri-o/vars/ubuntu.yml
index ee162aed4..213ce5a49 100644
--- a/roles/container-engine/cri-o/vars/ubuntu.yml
+++ b/roles/container-engine/cri-o/vars/ubuntu.yml
@@ -3,4 +3,4 @@
crio_packages:
- "cri-o-{{ crio_version }}"
-crio_runc_path: /usr/lib/cri-o-runc/sbin/runc
+crio_runc_path: /usr/sbin/runc
--
GitLab