From 90b20f2b8380a60a7d880d90f96fddbcb21b37d9 Mon Sep 17 00:00:00 2001 From: Bertrand Lanson Date: Thu, 28 Dec 2023 23:10:17 +0100 Subject: [PATCH] feat(tests): move molecule tests to extensions directory for it to work properly --- .../molecule}/no_tls_multi_node/converge.yml | 0 .../molecule}/no_tls_multi_node/molecule.yml | 0 .../molecule}/no_tls_multi_node/prepare.yml | 0 .../molecule/no_tls_multi_node}/requirements.yml | 1 + .../molecule}/no_tls_multi_node/verify.yml | 0 .../molecule}/no_tls_single_node/converge.yml | 0 .../molecule}/no_tls_single_node/molecule.yml | 0 .../molecule}/no_tls_single_node/prepare.yml | 0 .../molecule/no_tls_single_node}/requirements.yml | 0 .../molecule}/no_tls_single_node/verify.yml | 0 playbooks/bootstrap.yml | 10 ++++++++++ playbooks/deploy.yml | 9 +++++++++ playbooks/group_vars/all.yml | 2 +- 13 files changed, 21 insertions(+), 1 deletion(-) rename {molecule => extensions/molecule}/no_tls_multi_node/converge.yml (100%) rename {molecule => extensions/molecule}/no_tls_multi_node/molecule.yml (100%) rename {molecule => extensions/molecule}/no_tls_multi_node/prepare.yml (100%) rename {molecule/no_tls_single_node => extensions/molecule/no_tls_multi_node}/requirements.yml (86%) rename {molecule => extensions/molecule}/no_tls_multi_node/verify.yml (100%) rename {molecule => extensions/molecule}/no_tls_single_node/converge.yml (100%) rename {molecule => extensions/molecule}/no_tls_single_node/molecule.yml (100%) rename {molecule => extensions/molecule}/no_tls_single_node/prepare.yml (100%) rename {molecule/no_tls_multi_node => extensions/molecule/no_tls_single_node}/requirements.yml (100%) rename {molecule => extensions/molecule}/no_tls_single_node/verify.yml (100%) diff --git a/molecule/no_tls_multi_node/converge.yml b/extensions/molecule/no_tls_multi_node/converge.yml similarity index 100% rename from molecule/no_tls_multi_node/converge.yml rename to extensions/molecule/no_tls_multi_node/converge.yml diff --git a/molecule/no_tls_multi_node/molecule.yml b/extensions/molecule/no_tls_multi_node/molecule.yml similarity index 100% rename from molecule/no_tls_multi_node/molecule.yml rename to extensions/molecule/no_tls_multi_node/molecule.yml diff --git a/molecule/no_tls_multi_node/prepare.yml b/extensions/molecule/no_tls_multi_node/prepare.yml similarity index 100% rename from molecule/no_tls_multi_node/prepare.yml rename to extensions/molecule/no_tls_multi_node/prepare.yml diff --git a/molecule/no_tls_single_node/requirements.yml b/extensions/molecule/no_tls_multi_node/requirements.yml similarity index 86% rename from molecule/no_tls_single_node/requirements.yml rename to extensions/molecule/no_tls_multi_node/requirements.yml index ed11fdb..b2e8953 100644 --- a/molecule/no_tls_single_node/requirements.yml +++ b/extensions/molecule/no_tls_multi_node/requirements.yml @@ -3,6 +3,7 @@ roles: - name: ednxzu.manage_repositories - name: ednxzu.manage_apt_packages + - name: ednxzu.manage_pip_packages - name: ednxzu.install_docker - name: ednxzu.docker_systemd_service diff --git a/molecule/no_tls_multi_node/verify.yml b/extensions/molecule/no_tls_multi_node/verify.yml similarity index 100% rename from molecule/no_tls_multi_node/verify.yml rename to extensions/molecule/no_tls_multi_node/verify.yml diff --git a/molecule/no_tls_single_node/converge.yml b/extensions/molecule/no_tls_single_node/converge.yml similarity index 100% rename from molecule/no_tls_single_node/converge.yml rename to extensions/molecule/no_tls_single_node/converge.yml diff --git a/molecule/no_tls_single_node/molecule.yml b/extensions/molecule/no_tls_single_node/molecule.yml similarity index 100% rename from molecule/no_tls_single_node/molecule.yml rename to extensions/molecule/no_tls_single_node/molecule.yml diff --git a/molecule/no_tls_single_node/prepare.yml b/extensions/molecule/no_tls_single_node/prepare.yml similarity index 100% rename from molecule/no_tls_single_node/prepare.yml rename to extensions/molecule/no_tls_single_node/prepare.yml diff --git a/molecule/no_tls_multi_node/requirements.yml b/extensions/molecule/no_tls_single_node/requirements.yml similarity index 100% rename from molecule/no_tls_multi_node/requirements.yml rename to extensions/molecule/no_tls_single_node/requirements.yml diff --git a/molecule/no_tls_single_node/verify.yml b/extensions/molecule/no_tls_single_node/verify.yml similarity index 100% rename from molecule/no_tls_single_node/verify.yml rename to extensions/molecule/no_tls_single_node/verify.yml diff --git a/playbooks/bootstrap.yml b/playbooks/bootstrap.yml index ace6e8b..c5a92b2 100644 --- a/playbooks/bootstrap.yml +++ b/playbooks/bootstrap.yml @@ -5,6 +5,16 @@ gather_facts: true become: true tasks: + - name: "Install hvac library with pip" + ansible.builtin.include_role: + name: ednxzu.manage_pip_packages + vars: + manage_pip_packages_install_prereqs: true + manage_pip_packages_list: + - name: hvac + version_constraint: latest + state: present + - name: "Include ednxzu.install_docker" ansible.builtin.include_role: name: ednxzu.install_docker diff --git a/playbooks/deploy.yml b/playbooks/deploy.yml index 929ffa3..718d3b4 100644 --- a/playbooks/deploy.yml +++ b/playbooks/deploy.yml @@ -18,6 +18,15 @@ delegate_to: "{{ groups['vault_servers'] | first }}" register: _vault_init_secret + - name: "Write vault configuration to file" + ansible.builtin.copy: + content: "{{ _vault_init_secret.state }}" + dest: "{{ configuration_directory }}/vault/vault_config" + mode: '0600' + when: _vault_init_secret.state + run_once: true + delegate_to: localhost + - name: "Debug" ansible.builtin.debug: msg: "{{ _vault_init_secret }}" diff --git a/playbooks/group_vars/all.yml b/playbooks/group_vars/all.yml index c709e8d..db2ad06 100644 --- a/playbooks/group_vars/all.yml +++ b/playbooks/group_vars/all.yml @@ -11,7 +11,7 @@ deployment_method: "docker" api_interface: "eth0" api_interface_address: "{{ ansible_facts[api_interface]['ipv4']['address'] }}" -configuration_directory: "/tmp/hashistack-ansible" +configuration_directory: "/tmp/hashistack" ########################## # Support options ########