diff --git a/CHANGELOG.md b/CHANGELOG.md index 597d8c112..0cc4157b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ BUG FIXES: CI/CD: - Add Molecule tests for NGINX Amplify. +- Use the local role name (`ansible-role-nginx`) instead of the fully qualified role name (`nginxinc.nginx`) in Molecule to ensure tests always work as intended in environments where the role has been already installed beforehand. ## 0.24.2 (October 3rd, 2023) diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index b8e2b53d5..4a73b567d 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -4,7 +4,7 @@ tasks: - name: Install NGINX ansible.builtin.include_role: - name: nginxinc.nginx + name: ansible-role-nginx vars: nginx_modules: - geoip diff --git a/molecule/distribution/converge.yml b/molecule/distribution/converge.yml index 9d384ff78..f0b0c0d95 100644 --- a/molecule/distribution/converge.yml +++ b/molecule/distribution/converge.yml @@ -4,6 +4,6 @@ tasks: - name: Install NGINX ansible.builtin.include_role: - name: nginxinc.nginx + name: ansible-role-nginx vars: nginx_install_from: os_repository diff --git a/molecule/downgrade-plus/converge.yml b/molecule/downgrade-plus/converge.yml index 1715a5e38..85e6f43ed 100644 --- a/molecule/downgrade-plus/converge.yml +++ b/molecule/downgrade-plus/converge.yml @@ -21,7 +21,7 @@ tasks: - name: Install NGINX ansible.builtin.include_role: - name: nginxinc.nginx + name: ansible-role-nginx vars: nginx_type: plus nginx_license: diff --git a/molecule/downgrade/converge.yml b/molecule/downgrade/converge.yml index cd90f04f3..69c25dc0e 100644 --- a/molecule/downgrade/converge.yml +++ b/molecule/downgrade/converge.yml @@ -21,6 +21,6 @@ tasks: - name: Install NGINX ansible.builtin.include_role: - name: nginxinc.nginx + name: ansible-role-nginx vars: nginx_version: "{{ version }}" diff --git a/molecule/plus/converge.yml b/molecule/plus/converge.yml index f3e23f5c3..58147e23a 100644 --- a/molecule/plus/converge.yml +++ b/molecule/plus/converge.yml @@ -4,7 +4,7 @@ tasks: - name: Install NGINX Plus ansible.builtin.include_role: - name: nginxinc.nginx + name: ansible-role-nginx vars: nginx_type: plus nginx_license: diff --git a/molecule/source-version/converge.yml b/molecule/source-version/converge.yml index 6786ec8e1..34e2fc8e9 100644 --- a/molecule/source-version/converge.yml +++ b/molecule/source-version/converge.yml @@ -4,7 +4,7 @@ tasks: - name: Install NGINX from source ansible.builtin.include_role: - name: nginxinc.nginx + name: ansible-role-nginx vars: nginx_install_from: source nginx_branch: stable diff --git a/molecule/source/converge.yml b/molecule/source/converge.yml index 236f6f3ad..ee153009f 100644 --- a/molecule/source/converge.yml +++ b/molecule/source/converge.yml @@ -4,7 +4,7 @@ tasks: - name: Install NGINX from source ansible.builtin.include_role: - name: nginxinc.nginx + name: ansible-role-nginx vars: nginx_install_from: source nginx_branch: stable diff --git a/molecule/stable/converge.yml b/molecule/stable/converge.yml index 846f83395..755fc519e 100644 --- a/molecule/stable/converge.yml +++ b/molecule/stable/converge.yml @@ -4,6 +4,6 @@ tasks: - name: Install NGINX ansible.builtin.include_role: - name: nginxinc.nginx + name: ansible-role-nginx vars: nginx_branch: stable diff --git a/molecule/uninstall-plus/converge.yml b/molecule/uninstall-plus/converge.yml index aa999c192..3f26f3817 100644 --- a/molecule/uninstall-plus/converge.yml +++ b/molecule/uninstall-plus/converge.yml @@ -4,7 +4,7 @@ tasks: - name: Uninstall NGINX ansible.builtin.include_role: - name: nginxinc.nginx + name: ansible-role-nginx vars: nginx_type: plus nginx_setup_license: false diff --git a/molecule/uninstall/converge.yml b/molecule/uninstall/converge.yml index 766f8a931..1436d0756 100644 --- a/molecule/uninstall/converge.yml +++ b/molecule/uninstall/converge.yml @@ -4,6 +4,6 @@ tasks: - name: Uninstall NGINX ansible.builtin.include_role: - name: nginxinc.nginx + name: ansible-role-nginx vars: nginx_setup: uninstall diff --git a/molecule/upgrade-plus/converge.yml b/molecule/upgrade-plus/converge.yml index 9dc49452c..5610c0fc8 100644 --- a/molecule/upgrade-plus/converge.yml +++ b/molecule/upgrade-plus/converge.yml @@ -4,7 +4,7 @@ tasks: - name: Install NGINX Plus ansible.builtin.include_role: - name: nginxinc.nginx + name: ansible-role-nginx vars: nginx_type: plus nginx_license: diff --git a/molecule/upgrade/converge.yml b/molecule/upgrade/converge.yml index 60b8942b6..e26a427a2 100644 --- a/molecule/upgrade/converge.yml +++ b/molecule/upgrade/converge.yml @@ -4,6 +4,6 @@ tasks: - name: Install NGINX ansible.builtin.include_role: - name: nginxinc.nginx + name: ansible-role-nginx vars: nginx_setup: upgrade diff --git a/molecule/version/converge.yml b/molecule/version/converge.yml index 9ff5505ac..c57cfc69d 100644 --- a/molecule/version/converge.yml +++ b/molecule/version/converge.yml @@ -25,7 +25,7 @@ tasks: - name: Install NGINX ansible.builtin.include_role: - name: nginxinc.nginx + name: ansible-role-nginx vars: nginx_version: "{{ ngx_version }}" nginx_modules: