[airavata] branch AIRAVATA-3368-ansible-create-django-database-as-part-of-django- updated: AIRAVATA-3368 Move django database setup to django role

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch AIRAVATA-3368-ansible-create-django-database-as-part-of-django-
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/AIRAVATA-3368-ansible-create-django-database-as-part-of-django- by this push:
     new f28bc9c  AIRAVATA-3368 Move django database setup to django role
f28bc9c is described below

commit f28bc9cc2b9deb530027b2c710dde5ad0d37317d
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Sep 3 18:30:25 2020 -0400

    AIRAVATA-3368 Move django database setup to django role
---
 dev-tools/ansible/database.yml                        |  1 -
 dev-tools/ansible/roles/database/tasks/main.yml       |  3 ---
 .../tasks/django.yml => django/tasks/database.yml}    | 19 +++++--------------
 dev-tools/ansible/roles/django/tasks/main.yml         |  6 ++++++
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/dev-tools/ansible/database.yml b/dev-tools/ansible/database.yml
index 1ecc726..6c64d44 100644
--- a/dev-tools/ansible/database.yml
+++ b/dev-tools/ansible/database.yml
@@ -22,7 +22,6 @@
 # Gather facts on the following
 - hosts: api-orch
 - hosts: helix
-- hosts: django
 
 - hosts: database
   tags: mysql , airavata
diff --git a/dev-tools/ansible/roles/database/tasks/main.yml b/dev-tools/ansible/roles/database/tasks/main.yml
index 04ae6e8..775d405 100644
--- a/dev-tools/ansible/roles/database/tasks/main.yml
+++ b/dev-tools/ansible/roles/database/tasks/main.yml
@@ -142,9 +142,6 @@
 - include: keycloak.yml
   when: "'keycloak' in groups"
 
-- include: django.yml
-  when: "'django' in groups"
-
 - name: open firewall port {{ db_server_port }}
   firewalld: port="{{ db_server_port }}/tcp"
              zone=public permanent=true state=enabled immediate=yes
diff --git a/dev-tools/ansible/roles/database/tasks/django.yml b/dev-tools/ansible/roles/django/tasks/database.yml
similarity index 71%
rename from dev-tools/ansible/roles/database/tasks/django.yml
rename to dev-tools/ansible/roles/django/tasks/database.yml
index 7f2c864..964f8b0 100644
--- a/dev-tools/ansible/roles/database/tasks/django.yml
+++ b/dev-tools/ansible/roles/django/tasks/database.yml
@@ -20,21 +20,14 @@
 
 ---
 
-# Setup django user and databases
-- name: create django databases
-  mysql_db: name="{{ hostvars[item]['django_database_name'] }}" state=present encoding=utf8 collation=utf8_bin
-  with_items:
-  - "{{ groups['django'] }}"
+- name: create django database ({{ django_database_name }})
+  mysql_db: name="{{ django_database_name }}" state=present encoding=utf8 collation=utf8_bin
 
 - name: give access to {{ django_db_username }} from remote (internal ip)
-  mysql_user: name="{{ django_db_username }}" password="{{ django_db_password }}" host="{{ hostvars[item]['ansible_default_ipv4']['address']  }}"
-  with_items:
-  - "{{ groups['django'] }}"
+  mysql_user: name="{{ django_db_username }}" password="{{ django_db_password }}" host="{{ ansible_default_ipv4.address }}"
 
 - name: give access to {{ django_db_username }} from remote (public ip)
-  mysql_user: name="{{ django_db_username }}" password="{{ django_db_password }}" host="{{ hostvars[item].ansible_host }}"
-  with_items:
-  - "{{ groups['django'] }}"
+  mysql_user: name="{{ django_db_username }}" password="{{ django_db_password }}" host="{{ ansible_host }}"
 
 - name: give access to {{ django_db_username }} from localhost
   mysql_user: name="{{ django_db_username }}" password="{{ django_db_password }}" host="localhost"
@@ -44,6 +37,4 @@
               password="{{ django_db_password }}"
               append_privs=yes
               host_all=yes
-              priv={{ hostvars[item]['django_database_name'] }}.*:ALL,GRANT state=present
-  with_items:
-  - "{{ groups['django'] }}"
+              priv={{ django_database_name }}.*:ALL,GRANT state=present
diff --git a/dev-tools/ansible/roles/django/tasks/main.yml b/dev-tools/ansible/roles/django/tasks/main.yml
index 2e8124b..3f0eb42 100644
--- a/dev-tools/ansible/roles/django/tasks/main.yml
+++ b/dev-tools/ansible/roles/django/tasks/main.yml
@@ -27,6 +27,12 @@
   with_items:
   - "{{ groups['database'] }}"
 
+- name: Run tasks to setup Django database
+  include: database.yml
+  delegate_to: "{{ groups['database'][0] }}"
+  become: yes
+  become_user: "{{ hostvars[groups['database'][0]]['user'] }}"
+
 - name: Create root directory
   file: path="{{ doc_root_dir }}" state=directory owner="{{user}}" group="{{group}}"
   become: yes