diff --git a/dockerfiles/ansible-controller/docker-compose.yml b/dockerfiles/ansible-controller/docker-compose.yml index 618b7bf..11b3d16 100644 --- a/dockerfiles/ansible-controller/docker-compose.yml +++ b/dockerfiles/ansible-controller/docker-compose.yml @@ -8,7 +8,7 @@ services: command: sleep infinity environment: DOCKER_HOST: unix:///var/run/docker.sock - ANSIBLE_VAULT_PASSWORD_FILE: /ansible/vault-password.txt + ANSIBLE_VAULT_PASSWORD_FILE: /ansible/vault/.vault volumes: - /var/run/docker.sock:/var/run/docker.sock - .:/ansible diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 53140dd..ea530f3 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -37,10 +37,10 @@ echo "[vault] already encrypted: $f"; else echo "[vault] plaintext -> encrypt: $f"; - ansible-vault encrypt --encrypt-vault-id default --vault-password-file /workspace/vault-password.txt "$f"; + ansible-vault encrypt --encrypt-vault-id default --vault-password-file /workspace/vault/.vault "$f"; fi echo "[vault] decrypt for run: $f"; - ansible-vault decrypt --vault-password-file /workspace/vault-password.txt "$f"; + ansible-vault decrypt --vault-password-file /workspace/vault/.vault "$f"; done done ' @@ -67,7 +67,7 @@ echo "[vault] ok (encrypted): $f"; else echo "[vault] encrypt back: $f"; - ansible-vault encrypt --encrypt-vault-id default --vault-password-file /workspace/vault-password.txt "$f" || true; + ansible-vault encrypt --encrypt-vault-id default --vault-password-file /workspace/vault/.vault "$f" || true; fi done done diff --git a/molecule/default/create.yml b/molecule/default/create.yml index 204d6e5..aa4e832 100644 --- a/molecule/default/create.yml +++ b/molecule/default/create.yml @@ -27,18 +27,18 @@ groups: [test] tasks: - - name: Install required collections - command: ansible-galaxy collection install -r /workspace/requirements.yml - delegate_to: localhost - ignore_errors: true - register: collections_install - changed_when: false - run_once: true - become: true - vars: - ansible_python_interpreter: /usr/bin/python3 - environment: - ANSIBLE_COLLECTIONS_PATH: /usr/share/ansible/collections +# - name: Install required collections +# command: ansible-galaxy collection install -r /workspace/requirements.yml +# delegate_to: localhost +# ignore_errors: true +# register: collections_install +# changed_when: false +# run_once: true +# become: true +# vars: +# ansible_python_interpreter: /usr/bin/python3 +# environment: +# ANSIBLE_COLLECTIONS_PATH: /usr/share/ansible/collections - name: Load preset configuration include_vars: "{{ preset_file }}"