Upstream/ansible-role-k3s
1
0
Fork 0
mirror of https://github.com/PyratLabs/ansible-role-k3s.git synced 2024-11-22 11:48:22 +01:00
Code Issues Projects Releases Wiki Activity

Fixed issue with SUSE docker installation

Browse Source
This commit is contained in:
Xan Manning 2020-01-21 22:33:11 +00:00
parent 04a92ee956
commit e07903a5cf
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasks/state-installed.yml
View File

@ -23,7 +23,10 @@
and (k3s_non_root is not defined or not k3s_non_root) and (k3s_non_root is not defined or not k3s_non_root)
- include_tasks: build/install-docker-{{ ansible_distribution | replace(" ", "-") | lower }}.yml - include_tasks: build/install-docker-{{ ansible_distribution | replace(" ", "-") | lower }}.yml
when: ansible_distribution | replace(" ", "-") | lower in ['amazon', 'suse', 'opensuse-leap'] when: k3s_use_docker
and ((k3s_control_workers)
or (not k3s_control_workers and not k3s_control_node))
and ansible_distribution | replace(" ", "-") | lower in ['amazon', 'suse', 'opensuse-leap']
and (k3s_non_root is not defined or not k3s_non_root) and (k3s_non_root is not defined or not k3s_non_root)
- import_tasks: build/download-k3s.yml - import_tasks: build/download-k3s.yml

2
vagrant/Vagrantfile vendored
View File

@ -30,7 +30,7 @@ $opensuse_provision = <<SCRIPT
if [ ! -f .vagrant_provision ] ; then if [ ! -f .vagrant_provision ] ; then
echo "Installing dependencies ..." echo "Installing dependencies ..."
sudo zypper refresh > /dev/null 2>&1 && echo "[OK] Update Zypper cache." sudo zypper refresh > /dev/null 2>&1 && echo "[OK] Update Zypper cache."
sudo zypper install -y python > /dev/null 2>&1 && \ sudo zypper install -y python python-xml > /dev/null 2>&1 && \
echo "[OK] Installing Python." echo "[OK] Installing Python."
touch .vagrant_provision touch .vagrant_provision
else else

2
vagrant/inventory.yml
View File

@ -3,7 +3,7 @@
all: all:
vars: vars:
ansible_become: true ansible_become: true
k3s_ensure_docker_installed: false k3s_use_docker: false
k3s_nodes: k3s_nodes:
hosts: hosts: