From 652d621187ca1c93bce7ff2708d8112dd24492c8 Mon Sep 17 00:00:00 2001 From: Bertrand Lanson Date: Mon, 5 Feb 2024 22:52:19 +0100 Subject: [PATCH] feat(core): change namespace --- .github/workflows/publish.yml | 2 ++ README.md | 4 ++-- meta/main.yml | 22 ++++++++++----------- molecule/default/converge.yml | 4 ++-- molecule/default/verify.yml | 16 +++++++-------- molecule/default_vagrant/converge.yml | 4 ++-- molecule/default_vagrant/verify.yml | 16 +++++++-------- molecule/with_ssh_keys/converge.yml | 4 ++-- molecule/with_ssh_keys/verify.yml | 16 +++++++-------- molecule/with_ssh_keys_vagrant/converge.yml | 4 ++-- molecule/with_ssh_keys_vagrant/verify.yml | 16 +++++++-------- 11 files changed, 55 insertions(+), 53 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 784f2c9..e361dc8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,3 +16,5 @@ jobs: uses: ednxzu/galaxy-import-role@v1 with: galaxy-api-key: ${{ secrets.GALAXY_API_TOKEN }} + repository-owner: ednxzu + repository-name: provision_ansible_user diff --git a/README.md b/README.md index ee0224f..e9d0d49 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ Example Playbook # calling the role inside a playbook with either the default or group_vars/host_vars - hosts: servers roles: - - ednxzu.provision_ansible_user + - ednz_cloud.provision_ansible_user ``` ```yaml @@ -116,7 +116,7 @@ Example Playbook - name: "Provision ansible user" ansible.builtin.include_role: - name: ednxzu.provision_ansible_user + name: ednz_cloud.provision_ansible_user vars: provision_ansible_user_add_ssh_key: true provision_ansible_user_ssh_key: "{{ _keypair.public_key }}" diff --git a/meta/main.yml b/meta/main.yml index 2c2eed8..ff696f3 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,12 +1,12 @@ --- # meta file for provision_ansible_user galaxy_info: - namespace: 'ednxzu' - role_name: 'provision_ansible_user' - author: 'Bertrand Lanson' - description: 'Deploy the ansible service user on debian-based distros.' - license: 'license (BSD, MIT)' - min_ansible_version: '2.10' + namespace: "ednz_cloud" + role_name: "provision_ansible_user" + author: "Bertrand Lanson" + description: "Deploy the ansible service user on debian-based distros." + license: "license (BSD, MIT)" + min_ansible_version: "2.10" platforms: - name: Ubuntu versions: @@ -17,10 +17,10 @@ galaxy_info: - bullseye - bookworm galaxy_tags: - - 'ubuntu' - - 'debian' - - 'ansible' - - 'user' - - 'provisioning' + - "ubuntu" + - "debian" + - "ansible" + - "user" + - "provisioning" dependencies: [] diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 6350473..e93d7d2 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -3,6 +3,6 @@ hosts: all become: true tasks: - - name: "Include ednxzu.provision_ansible_user" + - name: "Include ednz_cloud.provision_ansible_user" ansible.builtin.include_role: - name: "ednxzu.provision_ansible_user" + name: "ednz_cloud.provision_ansible_user" diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index e0c5394..38853ef 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -10,23 +10,23 @@ ansible.builtin.getent: database: passwd key: ansible - register: ednxzu_ansible_user + register: ednz_cloud_ansible_user - name: "Getent group ansible" ansible.builtin.getent: database: group key: ansible - register: ednxzu_ansible_group + register: ednz_cloud_ansible_group - name: "Verify ansible user and group" ansible.builtin.assert: that: - - not ednxzu_ansible_user.failed - - not ednxzu_ansible_group.failed - - "'ansible' in ednxzu_ansible_user.ansible_facts.getent_passwd.keys()" - - "'/opt/ansible' in ednxzu_ansible_user.ansible_facts.getent_passwd['ansible']" - - "'/bin/bash' in ednxzu_ansible_user.ansible_facts.getent_passwd['ansible']" - - "'ansible' in ednxzu_ansible_group.ansible_facts.getent_group.keys()" + - not ednz_cloud_ansible_user.failed + - not ednz_cloud_ansible_group.failed + - "'ansible' in ednz_cloud_ansible_user.ansible_facts.getent_passwd.keys()" + - "'/opt/ansible' in ednz_cloud_ansible_user.ansible_facts.getent_passwd['ansible']" + - "'/bin/bash' in ednz_cloud_ansible_user.ansible_facts.getent_passwd['ansible']" + - "'ansible' in ednz_cloud_ansible_group.ansible_facts.getent_group.keys()" - name: "Test: ansible sudo permissions" block: diff --git a/molecule/default_vagrant/converge.yml b/molecule/default_vagrant/converge.yml index 6350473..e93d7d2 100644 --- a/molecule/default_vagrant/converge.yml +++ b/molecule/default_vagrant/converge.yml @@ -3,6 +3,6 @@ hosts: all become: true tasks: - - name: "Include ednxzu.provision_ansible_user" + - name: "Include ednz_cloud.provision_ansible_user" ansible.builtin.include_role: - name: "ednxzu.provision_ansible_user" + name: "ednz_cloud.provision_ansible_user" diff --git a/molecule/default_vagrant/verify.yml b/molecule/default_vagrant/verify.yml index e0c5394..38853ef 100644 --- a/molecule/default_vagrant/verify.yml +++ b/molecule/default_vagrant/verify.yml @@ -10,23 +10,23 @@ ansible.builtin.getent: database: passwd key: ansible - register: ednxzu_ansible_user + register: ednz_cloud_ansible_user - name: "Getent group ansible" ansible.builtin.getent: database: group key: ansible - register: ednxzu_ansible_group + register: ednz_cloud_ansible_group - name: "Verify ansible user and group" ansible.builtin.assert: that: - - not ednxzu_ansible_user.failed - - not ednxzu_ansible_group.failed - - "'ansible' in ednxzu_ansible_user.ansible_facts.getent_passwd.keys()" - - "'/opt/ansible' in ednxzu_ansible_user.ansible_facts.getent_passwd['ansible']" - - "'/bin/bash' in ednxzu_ansible_user.ansible_facts.getent_passwd['ansible']" - - "'ansible' in ednxzu_ansible_group.ansible_facts.getent_group.keys()" + - not ednz_cloud_ansible_user.failed + - not ednz_cloud_ansible_group.failed + - "'ansible' in ednz_cloud_ansible_user.ansible_facts.getent_passwd.keys()" + - "'/opt/ansible' in ednz_cloud_ansible_user.ansible_facts.getent_passwd['ansible']" + - "'/bin/bash' in ednz_cloud_ansible_user.ansible_facts.getent_passwd['ansible']" + - "'ansible' in ednz_cloud_ansible_group.ansible_facts.getent_group.keys()" - name: "Test: ansible sudo permissions" block: diff --git a/molecule/with_ssh_keys/converge.yml b/molecule/with_ssh_keys/converge.yml index 6350473..e93d7d2 100644 --- a/molecule/with_ssh_keys/converge.yml +++ b/molecule/with_ssh_keys/converge.yml @@ -3,6 +3,6 @@ hosts: all become: true tasks: - - name: "Include ednxzu.provision_ansible_user" + - name: "Include ednz_cloud.provision_ansible_user" ansible.builtin.include_role: - name: "ednxzu.provision_ansible_user" + name: "ednz_cloud.provision_ansible_user" diff --git a/molecule/with_ssh_keys/verify.yml b/molecule/with_ssh_keys/verify.yml index fd2382e..dc11404 100644 --- a/molecule/with_ssh_keys/verify.yml +++ b/molecule/with_ssh_keys/verify.yml @@ -10,23 +10,23 @@ ansible.builtin.getent: database: passwd key: ansible - register: ednxzu_ansible_user + register: ednz_cloud_ansible_user - name: "Getent group ansible" ansible.builtin.getent: database: group key: ansible - register: ednxzu_ansible_group + register: ednz_cloud_ansible_group - name: "Verify ansible user and group" ansible.builtin.assert: that: - - not ednxzu_ansible_user.failed - - not ednxzu_ansible_group.failed - - "'ansible' in ednxzu_ansible_user.ansible_facts.getent_passwd.keys()" - - "'/opt/ansible' in ednxzu_ansible_user.ansible_facts.getent_passwd['ansible']" - - "'/bin/bash' in ednxzu_ansible_user.ansible_facts.getent_passwd['ansible']" - - "'ansible' in ednxzu_ansible_group.ansible_facts.getent_group.keys()" + - not ednz_cloud_ansible_user.failed + - not ednz_cloud_ansible_group.failed + - "'ansible' in ednz_cloud_ansible_user.ansible_facts.getent_passwd.keys()" + - "'/opt/ansible' in ednz_cloud_ansible_user.ansible_facts.getent_passwd['ansible']" + - "'/bin/bash' in ednz_cloud_ansible_user.ansible_facts.getent_passwd['ansible']" + - "'ansible' in ednz_cloud_ansible_group.ansible_facts.getent_group.keys()" - name: "Test: ansible sudo permissions" block: diff --git a/molecule/with_ssh_keys_vagrant/converge.yml b/molecule/with_ssh_keys_vagrant/converge.yml index 6350473..e93d7d2 100644 --- a/molecule/with_ssh_keys_vagrant/converge.yml +++ b/molecule/with_ssh_keys_vagrant/converge.yml @@ -3,6 +3,6 @@ hosts: all become: true tasks: - - name: "Include ednxzu.provision_ansible_user" + - name: "Include ednz_cloud.provision_ansible_user" ansible.builtin.include_role: - name: "ednxzu.provision_ansible_user" + name: "ednz_cloud.provision_ansible_user" diff --git a/molecule/with_ssh_keys_vagrant/verify.yml b/molecule/with_ssh_keys_vagrant/verify.yml index fd2382e..dc11404 100644 --- a/molecule/with_ssh_keys_vagrant/verify.yml +++ b/molecule/with_ssh_keys_vagrant/verify.yml @@ -10,23 +10,23 @@ ansible.builtin.getent: database: passwd key: ansible - register: ednxzu_ansible_user + register: ednz_cloud_ansible_user - name: "Getent group ansible" ansible.builtin.getent: database: group key: ansible - register: ednxzu_ansible_group + register: ednz_cloud_ansible_group - name: "Verify ansible user and group" ansible.builtin.assert: that: - - not ednxzu_ansible_user.failed - - not ednxzu_ansible_group.failed - - "'ansible' in ednxzu_ansible_user.ansible_facts.getent_passwd.keys()" - - "'/opt/ansible' in ednxzu_ansible_user.ansible_facts.getent_passwd['ansible']" - - "'/bin/bash' in ednxzu_ansible_user.ansible_facts.getent_passwd['ansible']" - - "'ansible' in ednxzu_ansible_group.ansible_facts.getent_group.keys()" + - not ednz_cloud_ansible_user.failed + - not ednz_cloud_ansible_group.failed + - "'ansible' in ednz_cloud_ansible_user.ansible_facts.getent_passwd.keys()" + - "'/opt/ansible' in ednz_cloud_ansible_user.ansible_facts.getent_passwd['ansible']" + - "'/bin/bash' in ednz_cloud_ansible_user.ansible_facts.getent_passwd['ansible']" + - "'ansible' in ednz_cloud_ansible_group.ansible_facts.getent_group.keys()" - name: "Test: ansible sudo permissions" block: