From 3d2b74c816d07c7ffe9d05f4c5f76fa6e89bbec2 Mon Sep 17 00:00:00 2001 From: Xan Manning Date: Thu, 22 Oct 2020 19:30:40 +0100 Subject: [PATCH] Slight tidy up of playbooks in default molecule test --- molecule/default/playbook-rootless.yml | 5 ++++- molecule/default/playbook-uninstall-cluster.yml | 2 -- molecule/default/playbook-version.yml | 9 --------- 3 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 molecule/default/playbook-version.yml diff --git a/molecule/default/playbook-rootless.yml b/molecule/default/playbook-rootless.yml index ef6beff..5e1907e 100644 --- a/molecule/default/playbook-rootless.yml +++ b/molecule/default/playbook-rootless.yml @@ -5,8 +5,11 @@ become_user: k3suser vars: molecule_is_test: true - k3s_non_root: true k3s_use_experimental: true + k3s_server: + rootless: true + k3s_client: + rootless: true k3s_install_dir: "/home/{{ ansible_user_id }}/bin" roles: - role: xanmanning.k3s diff --git a/molecule/default/playbook-uninstall-cluster.yml b/molecule/default/playbook-uninstall-cluster.yml index 2ec1426..a756578 100644 --- a/molecule/default/playbook-uninstall-cluster.yml +++ b/molecule/default/playbook-uninstall-cluster.yml @@ -5,7 +5,5 @@ vars: molecule_is_test: true k3s_cluster_state: uninstalled - k3s_agent: - docker: true roles: - role: xanmanning.k3s diff --git a/molecule/default/playbook-version.yml b/molecule/default/playbook-version.yml deleted file mode 100644 index 740d9c9..0000000 --- a/molecule/default/playbook-version.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- name: Converge - hosts: all - become: true - vars: - molecule_is_test: true - k3s_release_version: v0.4.0 - roles: - - role: xanmanning.k3s