Skip to content

Commit

Permalink
Fix crio runc path on Ubuntu (#6035)
Browse files Browse the repository at this point in the history
  • Loading branch information
Miouge1 authored Apr 28, 2020
1 parent ed8c0ee commit 28333d4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
4 changes: 3 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 4 additions & 10 deletions roles/container-engine/cri-o/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion roles/container-engine/cri-o/vars/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 28333d4

Please sign in to comment.