From e7c5d821231cbecc917acd5f793c3be15d8726a0 Mon Sep 17 00:00:00 2001 From: Maxim Burgerhout Date: Tue, 13 Feb 2024 20:23:27 +0100 Subject: [PATCH] more docker changes --- roles/atuin_client/molecule/docker/converge.yml | 11 +---------- roles/atuin_client/molecule/docker/molecule.yml | 6 +----- roles/atuin_client/molecule/docker/verify.yml | 2 +- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/roles/atuin_client/molecule/docker/converge.yml b/roles/atuin_client/molecule/docker/converge.yml index 6dc499c..dc11fde 100644 --- a/roles/atuin_client/molecule/docker/converge.yml +++ b/roles/atuin_client/molecule/docker/converge.yml @@ -1,14 +1,5 @@ -- name: Fail if molecule group is missing - hosts: localhost - tasks: - - name: Assert group existence - ansible.builtin.assert: - that: "'molecule' in groups" - fail_msg: | - molecule group was not found inside inventory groups: {{ groups }} - - name: Converge - hosts: molecule + hosts: all # We disable gather facts because it would fail due to our container not # having python installed. This will not prevent use from running 'raw' # commands. Most molecule users are expected to use containers that already diff --git a/roles/atuin_client/molecule/docker/molecule.yml b/roles/atuin_client/molecule/docker/molecule.yml index bcd21e6..db35b56 100644 --- a/roles/atuin_client/molecule/docker/molecule.yml +++ b/roles/atuin_client/molecule/docker/molecule.yml @@ -33,8 +33,4 @@ provisioner: verifier: name: ansible driver: - options: - managed: False - login_cmd_template: "podman exec -ti {instance} bash" - ansible_connection_options: - ansible_connection: podman + name: docker diff --git a/roles/atuin_client/molecule/docker/verify.yml b/roles/atuin_client/molecule/docker/verify.yml index df8f836..51a8310 100644 --- a/roles/atuin_client/molecule/docker/verify.yml +++ b/roles/atuin_client/molecule/docker/verify.yml @@ -1,5 +1,5 @@ - name: Verify - hosts: molecule + hosts: all # We disable gather facts because it would fail due to our container not # having python installed. This will not prevent use from running 'raw' # commands. Most molecule users are expected to use containers that already