Fix crio runc path on Ubuntu (#6035)

pull/6020/head
Maxime Guyot 2020-04-28 14:28:06 +02:00 committed by GitHub
parent ed8c0ee95a
commit 28333d4513
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 12 deletions

View File

@ -14,7 +14,9 @@ Kubespray uses `yamllint` and `ansible-lint`. To run them locally use `yamllint
#### Molecule #### 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 #### Vagrant

View File

@ -8,31 +8,25 @@ lint:
options: options:
config-file: ../../../.yamllint config-file: ../../../.yamllint
platforms: platforms:
- name: kubespray-crio-ubuntu - name: ubuntu1804
box: generic/ubuntu1804 box: generic/ubuntu1804
cpus: 2 cpus: 2
memory: 1024 memory: 1024
groups: groups:
- kube-master - kube-master
- name: kubespray-crio-centos7 - name: centos7
box: centos/7 box: centos/7
cpus: 2 cpus: 2
memory: 1024 memory: 1024
groups: groups:
- kube-master - kube-master
- name: kubespray-crio-centos8 - name: centos8
box: centos/8 box: centos/8
cpus: 2 cpus: 2
memory: 1024 memory: 1024
groups: groups:
- kube-master - kube-master
- name: kubespray-crio-debian - name: fedora
box: generic/debian10
cpus: 2
memory: 1024
groups:
- kube-master
- name: kubespray-crio-fedora
box: fedora/31-cloud-base box: fedora/31-cloud-base
cpus: 2 cpus: 2
memory: 1024 memory: 1024

View File

@ -3,4 +3,4 @@
crio_packages: crio_packages:
- "cri-o-{{ crio_version }}" - "cri-o-{{ crio_version }}"
crio_runc_path: /usr/lib/cri-o-runc/sbin/runc crio_runc_path: /usr/sbin/runc