diff --git a/config-postgresql.yml b/config-postgresql.yml index 82d0bd3..610e3ab 100644 --- a/config-postgresql.yml +++ b/config-postgresql.yml @@ -1,3 +1,4 @@ - hosts: POSTGRESQL_DATABASES roles: + - { role: common } - { role: anxs.postgresql, become: yes } diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 26ef9ea..942fcd9 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -1,4 +1,5 @@ --- - name: Converge - hosts: all -- import_playbook: ../../full-site.yml + hosts: + - all +- import_playbook: ../../site3.yml diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 6b4514a..da566ac 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -11,7 +11,15 @@ platforms: - /sys/fs/cgroup:/sys/fs/cgroup:ro privileged: true pre_build_image: true + groups: + - ECHALOASUERTE + - POSTGRESQL_DATABASES provisioner: name: ansible + inventory: + group_vars: + all: + ansible_python_interpreter: "/usr/bin/python3" + verifier: name: ansible diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index e740798..6567d0c 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -12,6 +12,7 @@ - curl - fail2ban - jq + - gpg-agent state: present update-cache: yes become: yes diff --git a/roles/users/tasks/main.yml b/roles/users/tasks/main.yml index 01231df..9571465 100644 --- a/roles/users/tasks/main.yml +++ b/roles/users/tasks/main.yml @@ -1,4 +1,8 @@ --- +- debug: + var: ansible_python_interpreter +- setup: + - name: Create dev group group: name: dev