diff --git a/cookiecutter.json b/cookiecutter.json index f4e55ca..666be98 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -3,10 +3,11 @@ "role_name": "{{ cookiecutter.role_title | lower | replace(' ','_') }}", "repo_name": "ansible-role-{{ cookiecutter.role_title | lower | replace(' ','_') }}", "branch_name": "main", + "namespace": "guisea", "author": "Aaron Guise", "short_description": "This role does amazing things", "company": "Acme, Inc.", - "galaxy_username": "{{ cookiecutter.author | lower | replace(' ', '') }}", + "galaxy_username": "{{ cookiecutter.namespace | lower | replace(' ', '') }}", "azp_username": "{{ cookiecutter.author | lower | replace(' ', '') }}", "azp_branch": "main", "license": "Apache 2.0", diff --git a/{{ cookiecutter.role_name }}/Makefile b/{{ cookiecutter.role_name }}/Makefile index 77e4a69..2eb888b 100644 --- a/{{ cookiecutter.role_name }}/Makefile +++ b/{{ cookiecutter.role_name }}/Makefile @@ -7,11 +7,10 @@ virtualenv: virtualenv --prompt '|> {{ cookiecutter.role_title | lower | replace(' ','_') }} <| ' .venv .venv/bin/pip install --upgrade pip .venv/bin/pip install -r requirements.txt - .venv/bin/ansible-galaxy collection install -r requirements.yml + .venv/bin/ansible-galaxy collection install -r molecule/default/requirements.yml @echo @echo "VirtualENV Setup Complete. Now run: source .venv/bin/activate" @echo - source .venv/bin/activate test: virtualenv for distro in almalinux9 ; do \ diff --git a/{{ cookiecutter.role_name }}/meta/main.yml b/{{ cookiecutter.role_name }}/meta/main.yml index d1a8aeb..24cb184 100644 --- a/{{ cookiecutter.role_name }}/meta/main.yml +++ b/{{ cookiecutter.role_name }}/meta/main.yml @@ -1,4 +1,5 @@ galaxy_info: + namespace: {{ cookiecutter.namespace | lower | replace(' ', '_') }} role_name: {{ cookiecutter.role_name | lower | replace(' ', '_') }} author: {{ cookiecutter.author }} description: {{ cookiecutter.short_description }}