diff --git a/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/converge.yml b/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/converge.yml index 124f9bf..63a14d7 100644 --- a/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/converge.yml +++ b/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/converge.yml @@ -16,29 +16,36 @@ - name: Converge hosts: molecule gather_facts: true + vars_files: + - ../../../../../../../inventory/group_vars/all/vars.yml + - ../../../../../../../inventory/group_vars/all/vault.yml + - ./platform_vars.yml tasks: + - include_vars: ../../../../../../../inventory/group_vars/all/vars.yml + - include_vars: ../../../../../../../inventory/group_vars/all/vault.yml + - include_vars: ./platform_vars.yml - name: Enable guest console access become: true ansible.builtin.systemd_service: name: serial-getty@ttyS0.service enabled: true state: restarted - - name: Testing common role - ansible.builtin.include_role: - name: nullified.infrastructure.common - tasks_from: main.yml - - name: Testing development role - ansible.builtin.include_role: - name: nullified.infrastructure.development - tasks_from: main.yml - name: Testing security role ansible.builtin.include_role: name: nullified.infrastructure.security tasks_from: main.yml + - name: Testing common role + ansible.builtin.include_role: + name: nullified.infrastructure.common + tasks_from: main.yml - name: Testing server role ansible.builtin.include_role: name: nullified.infrastructure.server tasks_from: main.yml + - name: Testing development role + ansible.builtin.include_role: + name: nullified.infrastructure.development + tasks_from: main.yml - name: Testing workstation role ansible.builtin.include_role: name: nullified.infrastructure.workstation diff --git a/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/molecule.yml b/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/molecule.yml index 227b4a1..eea7b58 100644 --- a/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/molecule.yml +++ b/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/molecule.yml @@ -35,5 +35,4 @@ provisioner: name: ansible inventory: group_vars: - all: - custom_base_user_account: 'vagrant' + molecule: diff --git a/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/platform_vars.yml b/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/platform_vars.yml new file mode 100644 index 0000000..2dac9e4 --- /dev/null +++ b/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/platform_vars.yml @@ -0,0 +1 @@ +custom_base_user_account: 'vagrant'