diff --git a/roles/nginx/meta/main.yml b/roles/nginx/meta/main.yml index 33b67c1..b6e9df6 100644 --- a/roles/nginx/meta/main.yml +++ b/roles/nginx/meta/main.yml @@ -10,8 +10,8 @@ galaxy_info: platforms: - name: "Ubuntu" - versions: [ "focal", "jammy", "noble" ] + versions: ["focal", "jammy", "noble"] - galaxy_tags: [ ] + galaxy_tags: [] dependencies: [] diff --git a/roles/nginx/molecule/default/converge.yml b/roles/nginx/molecule/default/converge.yml index c6034a0..30c3718 100644 --- a/roles/nginx/molecule/default/converge.yml +++ b/roles/nginx/molecule/default/converge.yml @@ -20,7 +20,7 @@ roles: # using default NGINX verison - - role: genlab.nginx + - role: genlab.common.nginx site: confname: test-var content: | diff --git a/roles/nginx/molecule/default/verify.yml b/roles/nginx/molecule/default/verify.yml index 416523b..23748b8 100644 --- a/roles/nginx/molecule/default/verify.yml +++ b/roles/nginx/molecule/default/verify.yml @@ -43,30 +43,30 @@ fail_msg: "NGINX service is not enabled." - name: "Get an HTTP response from the test site (single site deployment from a variable)" - register: response + register: nginx_response ansible.builtin.uri: url: http://localhost:80 status_code: 200 return_content: true - - name: "Check the response correctness" + - name: "Check the response correctness on port 80" vars: - message: "{{ response.content | trim }}" + message: "{{ nginx_response.content | trim }}" ansible.builtin.assert: that: message == 'Hello from ansible-nginx!' success_msg: "{{ message }}" fail_msg: "Unexpected response from the test site: '{{ message }}'" - name: "Get an HTTP response from the test site (site deployment from a dictionary)" - register: response + register: nginx_response ansible.builtin.uri: url: http://localhost:8080 status_code: 200 return_content: true - - name: "Check the response correctness" + - name: "Check the response correctness on port 8080" vars: - message: "{{ response.content | trim }}" + message: "{{ nginx_response.content | trim }}" ansible.builtin.assert: that: message == 'Hello from ansible-nginx!' success_msg: "{{ message }}"