fix: prefer module_role_path instead of role_path

Author: saitho

__tests__/test-tf-generation.yml

@@ -11,11 +11,11 @@
       with_items: "{{ app_config.domains }}"
     - block:
         - name: Generate Nginx Server Block Terraform file
-          import_tasks: "{{ role_path }}/tasks/nginx_steps/generate-serverblock-tf.yml"
+          import_tasks: "{{ module_role_path | default(role_path) }}/tasks/nginx_steps/generate-serverblock-tf.yml"
         - name: Generate htpasswd Terraform file
-          import_tasks: "{{ role_path }}/tasks/nginx_steps/generate-htpasswd-tf.yml"
+          import_tasks: "{{ module_role_path | default(role_path) }}/tasks/nginx_steps/generate-htpasswd-tf.yml"
       vars:
-        role_path: ".."
+        module_role_path: ".."
         nginx_usehttps: 1
         nginx_servername: "test_project"
         stackhead__acme_folder: ""

tasks/nginx_steps/generate-htpasswd-tf.yml

@@ -1,6 +1,6 @@
 ---
 - name: Generate htpasswd Terraform file
   template:
-    src: "{{ role_path }}/templates/terraform/htpasswd.tf.j2"
+    src: "{{ module_role_path | default(role_path) }}/templates/terraform/htpasswd.tf.j2"
     dest: "{{ stackhead__tf_project_folder }}/htpasswd.tf"
-    force: true
+    force: true

tasks/nginx_steps/generate-serverblock-tf.yml

@@ -1,6 +1,6 @@
 ---
 - name: Generate nginx server block Terraform file
   template:
-    src: "{{ role_path }}/templates/terraform/nginx_server_block_docker.tf.j2"
+    src: "{{ module_role_path | default(role_path) }}/templates/terraform/nginx_server_block_docker.tf.j2"
     dest: "{{ stackhead__tf_project_folder }}/nginx_server_block.tf"
-    force: true
+    force: true

tasks/steps/deploy.yml

@@ -6,10 +6,10 @@
   when: item.security is defined and item.security.authentication is defined
   with_items: "{{ app_config.domains }}"
 
-- include_tasks: "{{ role_path }}/tasks/nginx_steps/generate-htpasswd-tf.yml"
+- include_tasks: "{{ module_role_path | default(role_path) }}/tasks/nginx_steps/generate-htpasswd-tf.yml"
   when: auths_basic is defined and auths_basic | length > 0
 
-- include_tasks: "{{ role_path }}/tasks/nginx_steps/generate-serverblock-tf.yml"
+- include_tasks: "{{ module_role_path | default(role_path) }}/tasks/nginx_steps/generate-serverblock-tf.yml"
 
 # Generate SSL certificate configurations
 - include_tasks: "{{ stackhead__roles }}/stackhead_module_api/tasks/ssl-certificate.yml"

tasks/steps/setup.yml

@@ -2,10 +2,10 @@
 ---
 - name: Deploy additional h5bp Nginx files
   synchronize:
-    src: "{{ role_path }}/vendor/server-configs-nginx/h5bp"
+    src: "{{ module_role_path | default(role_path) }}/vendor/server-configs-nginx/h5bp"
     dest: /etc/nginx
 - set_fact:
-    nginx_conf_template: "{{ role_path }}/templates/nginx/nginx.conf.j2"
+    nginx_conf_template: "{{ module_role_path | default(role_path) }}/templates/nginx/nginx.conf.j2"
 - name: Setup Nginx
   vars:
     nginx_ppa_use: true

templates/terraform/nginx_server_block_docker.tf.j2

@@ -18,10 +18,10 @@ resource "nginx_server_block" "nginx-{{ project_name }}" {
 {%- for nginx_expose in domainConfig.expose if nginx_expose.external_port != 443 %}
 {% set port_index = all_ports|selectattr('service', 'equalto', nginx_expose.service)|selectattr('internal_port', 'equalto', nginx_expose.internal_port)|map(attribute='index')|first %}
 {% if nginx_expose.external_port == 80 %}
-{{ lookup('template', "{{ role_path }}/templates/nginx/serverblock.http.j2", template_vars=dict(domainConfig=ns.domainCfg)) }}
-{{ lookup('template', "{{ role_path }}/templates/nginx/serverblock.container-reverseproxy.j2", template_vars=dict(port_index=port_index,domainConfig=ns.domainCfg)) }}
+{{ lookup('template', "{{ module_role_path | default(role_path) }}/templates/nginx/serverblock.http.j2", template_vars=dict(domainConfig=ns.domainCfg)) }}
+{{ lookup('template', "{{ module_role_path | default(role_path) }}/templates/nginx/serverblock.container-reverseproxy.j2", template_vars=dict(port_index=port_index,domainConfig=ns.domainCfg)) }}
 {% else %}
-{{ lookup('template', "{{ role_path }}/templates/nginx/serverblock.container-reverseproxy.j2", template_vars=dict(port_index=port_index,port=nginx_expose.external_port,domainConfig=ns.domainCfg)) }}
+{{ lookup('template', "{{ module_role_path | default(role_path) }}/templates/nginx/serverblock.container-reverseproxy.j2", template_vars=dict(port_index=port_index,port=nginx_expose.external_port,domainConfig=ns.domainCfg)) }}
 {% endif %}
 {%- endfor %}
 {%- endfor %}