Solved other refactoring bugs and optimized docker role template

templates/docker_role/tasks/main.yml.j2

@@ -1,6 +1,6 @@
 ---
 
-{% if database | bool %}
+{% if database_type | bool %}
 
 {% raw %}
 - name: "include docker-central-database"
@@ -8,13 +8,6 @@
     name: docker-central-database
   when: run_once_docker_{% endraw %}{{ application_id }}{% raw %} is not defined
 
-- name: "include role nginx-domain-setup for {{application_id}}"
-  include_role:
-    name: nginx-domain-setup
-  vars:
-    domain:   "{{ domains | get_domain(application_id) }}"
-    http_port:   "{{ ports.localhost.http[application_id] }}"
-  when: run_once_docker_{% endraw %}{{ application_id }}{% raw %} is not defined
 {% endraw %}
 
 {% else %}
@@ -29,6 +22,15 @@
 {% endif %}
 
 {% raw %}
+
+- name: "include role nginx-domain-setup for {{application_id}}"
+  include_role:
+    name: nginx-domain-setup
+  vars:
+    domain:   "{{ domains | get_domain(application_id) }}"
+    http_port:   "{{ ports.localhost.http[application_id] }}"
+  when: run_once_docker_{% endraw %}{{ application_id }}{% raw %} is not defined
+
 - name: run the {% raw %}portfolio{% endraw %} tasks once
   set_fact:
     run_once_docker_portfolio: true