[airavata] 05/05: Use IP address (internal network) from API server to database

[ma...@apache.org]

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

machristie pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit cc699a4193a3f86750ce8af6b8cf7ea3d9329bda
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Apr 18 17:26:46 2018 -0400

    Use IP address (internal network) from API server to database
---
 dev-tools/ansible/airavata.yml                            | 15 +++------------
 dev-tools/ansible/apiserver.yml                           |  3 +++
 dev-tools/ansible/database.yml                            |  3 +++
 .../inventories/scigap/staging/group_vars/all/vars.yml    |  2 +-
 dev-tools/ansible/roles/database/tasks/main.yml           |  4 ++--
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/dev-tools/ansible/airavata.yml b/dev-tools/ansible/airavata.yml
index 7a46c57..5969528 100644
--- a/dev-tools/ansible/airavata.yml
+++ b/dev-tools/ansible/airavata.yml
@@ -19,6 +19,9 @@
 #
 
 ---
+- hosts: database
+  gather_facts: True
+
 - hosts: zookeeper
   tags: zookeeper, airavata
   roles:
@@ -32,18 +35,6 @@
     - env_setup
     - rabbitmq
 
-- hosts: gfac
-  tags: gfac, airavata
-  roles:
-    - env_setup
-    - java
-    - role: common
-      become: yes
-      become_user: "{{user}}"
-    - role: gfac
-      become: yes
-      become_user: "{{user}}"
-
 - hosts: api-orch
   tags: api-orch, airavata
   roles:
diff --git a/dev-tools/ansible/apiserver.yml b/dev-tools/ansible/apiserver.yml
index 222febf..d1460b4 100644
--- a/dev-tools/ansible/apiserver.yml
+++ b/dev-tools/ansible/apiserver.yml
@@ -19,6 +19,9 @@
 #
 
 ---
+# Just gather facts on database
+- hosts: database
+  gather_facts: True
 - hosts: api-orch
   tags: api-orch, airavata
   roles:
diff --git a/dev-tools/ansible/database.yml b/dev-tools/ansible/database.yml
index fc3dfef..972b6ac 100644
--- a/dev-tools/ansible/database.yml
+++ b/dev-tools/ansible/database.yml
@@ -1,4 +1,7 @@
 ---
+# Gather facts on the following
+- hosts: api-orch
+- hosts: gfac
 
 - hosts: database
   tags: mysql , airavata
diff --git a/dev-tools/ansible/inventories/scigap/staging/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/staging/group_vars/all/vars.yml
index 12c42f8..9412531 100644
--- a/dev-tools/ansible/inventories/scigap/staging/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/staging/group_vars/all/vars.yml
@@ -36,7 +36,7 @@ old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
 git_branch: staging
 
 # Database related variables
-db_server: "{{ groups['database'][0] }}"
+db_server: "{{ hostvars[groups['database'][0]]['ansible_default_ipv4']['address'] }}"
 db_server_port: "3306"
 db_user: "airavata"
 db_password: "{{ vault_db_password }}"
diff --git a/dev-tools/ansible/roles/database/tasks/main.yml b/dev-tools/ansible/roles/database/tasks/main.yml
index ff2066c..298d7b9 100644
--- a/dev-tools/ansible/roles/database/tasks/main.yml
+++ b/dev-tools/ansible/roles/database/tasks/main.yml
@@ -118,14 +118,14 @@
     - "{{ mysql_databases }}"
 
 - name: give access to {{ db_user }} from remote
-  mysql_user: name="{{ db_user }}" password="{{ db_password }}" host="{{ item }}"
+  mysql_user: name="{{ db_user }}" password="{{ db_password }}" host="{{ hostvars[item]['ansible_default_ipv4']['address'] }}"
   with_items:
     - "{{ groups['api-orch'] }}"
     - "localhost"
 
 # TODO: database access from GFac is no longer needed (GFac deprecated and only using Registry API)
 - name: give access to {{ db_user }} from remote
-  mysql_user: name="{{ db_user }}" password="{{ db_password }}" host="{{ item }}"
+  mysql_user: name="{{ db_user }}" password="{{ db_password }}" host="{{ hostvars[item]['ansible_default_ipv4']['address'] }}"
   with_items:
     - "{{ groups['gfac'] }}"
   when: "'gfac' in groups"

-- 
To stop receiving notification emails like this one, please contact
machristie@apache.org.