airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject airavata git commit: AIRAVATA-2335 Reorganized inventories; updates for deploying on Jetstream
Date Tue, 07 Mar 2017 14:59:57 GMT
Repository: airavata
Updated Branches:
  refs/heads/ansible-testing-0.17 [created] 13251fabc


AIRAVATA-2335 Reorganized inventories; updates for deploying on Jetstream


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/13251fab
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/13251fab
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/13251fab

Branch: refs/heads/ansible-testing-0.17
Commit: 13251fabc1779c2e1cd39dd082e5474a4e71f06e
Parents: 6c367b9
Author: Marcus Christie <machristie@apache.org>
Authored: Tue Mar 7 09:58:17 2017 -0500
Committer: Marcus Christie <machristie@apache.org>
Committed: Tue Mar 7 09:58:17 2017 -0500

----------------------------------------------------------------------
 dev-tools/ansible/.gitignore                    |  1 +
 dev-tools/ansible/airavata.yml                  | 47 ++++++++++
 dev-tools/ansible/group_vars/.gitignore         |  1 -
 dev-tools/ansible/group_vars/all.yml            | 91 --------------------
 dev-tools/ansible/group_vars/dev-airavata.yml   |  2 -
 dev-tools/ansible/group_vars/dev-pga.yml        |  3 -
 dev-tools/ansible/group_vars/local.yml.template |  4 -
 .../inventories/develop/group_vars/.gitignore   |  1 +
 .../inventories/develop/group_vars/all.yml      | 91 ++++++++++++++++++++
 .../develop/group_vars/dev-airavata.yml         |  2 +
 .../inventories/develop/group_vars/dev-pga.yml  |  3 +
 .../develop/group_vars/local.yml.template       |  4 +
 .../inventories/testing-0.17/group_vars/all.yml | 91 ++++++++++++++++++++
 .../ansible/inventories/testing-0.17/hosts      | 20 +++++
 .../ansible/roles/api-orch/defaults/main.yml    |  1 +
 .../templates/airavata-server.properties.j2     | 12 +++
 .../database/files/MariaDB_yum_CentOS_7.repo    |  7 ++
 dev-tools/ansible/roles/database/tasks/main.yml | 12 ++-
 dev-tools/ansible/roles/database/vars/main.yml  |  6 +-
 19 files changed, 295 insertions(+), 104 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/.gitignore
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/.gitignore b/dev-tools/ansible/.gitignore
new file mode 100644
index 0000000..a8b42eb
--- /dev/null
+++ b/dev-tools/ansible/.gitignore
@@ -0,0 +1 @@
+*.retry

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/airavata.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/airavata.yml b/dev-tools/ansible/airavata.yml
new file mode 100644
index 0000000..6111871
--- /dev/null
+++ b/dev-tools/ansible/airavata.yml
@@ -0,0 +1,47 @@
+---
+- hosts: zookeeper
+  tags: zookeeper, airavata
+  roles:
+    - env_setup
+    - java
+    - zookeeper
+
+- hosts: rabbitmq
+  tags: rabbitmq, airavata
+  roles:
+    - env_setup
+    - rabbitmq
+
+- hosts: database
+  tags: mysql , airavata
+  roles:
+    - env_setup
+    - role: database
+      become: yes
+      become_user: "{{user}}"
+
+- 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:
+    - env_setup
+    - java
+    - role: common
+      become: yes
+      become_user: "{{user}}"
+    - role: api-orch
+      become: yes
+      become_user: "{{user}}"
+
+...

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/group_vars/.gitignore
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/group_vars/.gitignore b/dev-tools/ansible/group_vars/.gitignore
deleted file mode 100644
index 20ebc05..0000000
--- a/dev-tools/ansible/group_vars/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-local.yml

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/group_vars/all.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/group_vars/all.yml b/dev-tools/ansible/group_vars/all.yml
deleted file mode 100644
index 534ac6a..0000000
--- a/dev-tools/ansible/group_vars/all.yml
+++ /dev/null
@@ -1,91 +0,0 @@
----
-ansible_connection: ssh
-# ansible_user: centos
-ansible_user: root
-ansible_ssh_private_key_file: /Users/supun/Desktop/shameera-key.pem
-# ansible_ssh_private_key_file: /Users/syodage/Projects/airavata-ansible/shameera-aws.pem.txt
-
-user: centos
-group: centos
-user_home: "/home/{{ user }}"
-
-# deployment related variables
-deployment_dir: "{{ user_home }}/dev-deployment"
-airavata_source_dir: "{{ user_home }}/source"
-airavata_repo: "https://git-wip-us.apache.org/repos/asf/airavata.git"
-airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
-airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
-old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
-git_branch: develop
-
-# Database related variables
-db_server: "{{ groups['database'][0] }}"
-db_server_port: "3306"
-db_user: "airavata"
-db_password: "airavata"
-app_catalog: "app_catalog"
-exp_catalog: "exp_catalog"
-replica_catalog: "replica_catalog"
-sharing_catalog: "sharing_catalog"
-workflow_catalog: "wf_catalog"
-credential_store: "credential_store"
-
-mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
-
-# Rabbitmq related vareables
-rabbitmq_server: "{{ groups['rabbitmq'][0] }}"
-rabbitmq_vhost: "develop"
-rabbitmq_user: "airavata"
-rabbitmq_password: "airavata"
-rabbitmq_port: "5672"
-rabbitmq_broker_url: "amqp://{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ rabbitmq_server}}:{{
rabbitmq_port }}/{{ rabbitmq_vhost }}"
-
-# Zoookeeper related variables
-zookeeper_client_port: 2181
-zookeeper_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
-# API Server related variables
-api_server_name: "apiserver-node0"
-api_server_host: "{{ansible_fqdn}}"
-api_server_port: "8930"
-api_secured: "false"
-tls_enable: "false"
-api_server_tls_port: "9930"
-enable_sharing: "true"
-
-# Orchestrator  related variables
-orchestrator_name: "orchestrator-node0"
-orchestrator_host: "{{ansible_fqdn}}"
-orchestrator_port: "8940"
-api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
-
-# registry related variables
-registry_name: regserver-node0
-registry_host: "{{groups['registry'][0]}}"
-registry_port: 8970
-registry_dir: "{{ deployment_dir }}/registry"
-default_gateway: "php_reference_gateway"
-
-# Credential and keystore related variables
-#authorization_server: "https://{{ groups['wso2is'][0]}}:9443/services/"
-authorization_server: "https://idp.scigap.org:9443/services/"
-keystore: "airavata.jks"
-keystore_passwd: "airavata"
-#client_truststore: "client_truststore.jks"
-client_truststore: "airavata.jks"
-client_truststore_passwd: "airavata"
-cred_keystore: "airavata_sym.jks"
-cred_keystore_passwd: "airavata"
-cred_keystore_alias: "airavata"
-cred_store_server_host: "{{ ansible_fqdn }}"
-cred_store_port: "8960"
-keystores_location: "{{ deployment_dir }}/keystores"
-
-# Gfac related variables
-gfac_name: "gfac-node0"
-gfac_host: "{{ ansible_fqdn }}"
-gfac_port: "8950"
-gfac_dir: "{{ deployment_dir }}/gfac-instance"
-
-# Monitoring variables
-monitor_email_address: "test.airavata@gmail.com"
-monitor_email_password: "airavata"

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/group_vars/dev-airavata.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/group_vars/dev-airavata.yml b/dev-tools/ansible/group_vars/dev-airavata.yml
deleted file mode 100644
index 06586ec..0000000
--- a/dev-tools/ansible/group_vars/dev-airavata.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-airavata_source_dir: "/home/airavata/dev-airavata-source"
-deployment_dir: "/home/airavata/dev-deployment"

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/group_vars/dev-pga.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/group_vars/dev-pga.yml b/dev-tools/ansible/group_vars/dev-pga.yml
deleted file mode 100644
index 7b82521..0000000
--- a/dev-tools/ansible/group_vars/dev-pga.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-portals_dir: /home/pga/portals
-git_branch: develop
-airavata_php_gateway_repo: https://git-wip-us.apache.org/repos/asf/airavata-php-gateway.git

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/group_vars/local.yml.template
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/group_vars/local.yml.template b/dev-tools/ansible/group_vars/local.yml.template
deleted file mode 100644
index d7ff4e9..0000000
--- a/dev-tools/ansible/group_vars/local.yml.template
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-airavata_source_dir: "/Users/machrist/Documents/Airavata/airavata"
-deployment_dir: "/Users/machrist/Documents/Airavata/LocalAiravata"

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/inventories/develop/group_vars/.gitignore
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/develop/group_vars/.gitignore b/dev-tools/ansible/inventories/develop/group_vars/.gitignore
new file mode 100644
index 0000000..20ebc05
--- /dev/null
+++ b/dev-tools/ansible/inventories/develop/group_vars/.gitignore
@@ -0,0 +1 @@
+local.yml

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/inventories/develop/group_vars/all.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/develop/group_vars/all.yml b/dev-tools/ansible/inventories/develop/group_vars/all.yml
new file mode 100644
index 0000000..534ac6a
--- /dev/null
+++ b/dev-tools/ansible/inventories/develop/group_vars/all.yml
@@ -0,0 +1,91 @@
+---
+ansible_connection: ssh
+# ansible_user: centos
+ansible_user: root
+ansible_ssh_private_key_file: /Users/supun/Desktop/shameera-key.pem
+# ansible_ssh_private_key_file: /Users/syodage/Projects/airavata-ansible/shameera-aws.pem.txt
+
+user: centos
+group: centos
+user_home: "/home/{{ user }}"
+
+# deployment related variables
+deployment_dir: "{{ user_home }}/dev-deployment"
+airavata_source_dir: "{{ user_home }}/source"
+airavata_repo: "https://git-wip-us.apache.org/repos/asf/airavata.git"
+airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
+old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+git_branch: develop
+
+# Database related variables
+db_server: "{{ groups['database'][0] }}"
+db_server_port: "3306"
+db_user: "airavata"
+db_password: "airavata"
+app_catalog: "app_catalog"
+exp_catalog: "exp_catalog"
+replica_catalog: "replica_catalog"
+sharing_catalog: "sharing_catalog"
+workflow_catalog: "wf_catalog"
+credential_store: "credential_store"
+
+mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
+
+# Rabbitmq related vareables
+rabbitmq_server: "{{ groups['rabbitmq'][0] }}"
+rabbitmq_vhost: "develop"
+rabbitmq_user: "airavata"
+rabbitmq_password: "airavata"
+rabbitmq_port: "5672"
+rabbitmq_broker_url: "amqp://{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ rabbitmq_server}}:{{
rabbitmq_port }}/{{ rabbitmq_vhost }}"
+
+# Zoookeeper related variables
+zookeeper_client_port: 2181
+zookeeper_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
+# API Server related variables
+api_server_name: "apiserver-node0"
+api_server_host: "{{ansible_fqdn}}"
+api_server_port: "8930"
+api_secured: "false"
+tls_enable: "false"
+api_server_tls_port: "9930"
+enable_sharing: "true"
+
+# Orchestrator  related variables
+orchestrator_name: "orchestrator-node0"
+orchestrator_host: "{{ansible_fqdn}}"
+orchestrator_port: "8940"
+api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
+
+# registry related variables
+registry_name: regserver-node0
+registry_host: "{{groups['registry'][0]}}"
+registry_port: 8970
+registry_dir: "{{ deployment_dir }}/registry"
+default_gateway: "php_reference_gateway"
+
+# Credential and keystore related variables
+#authorization_server: "https://{{ groups['wso2is'][0]}}:9443/services/"
+authorization_server: "https://idp.scigap.org:9443/services/"
+keystore: "airavata.jks"
+keystore_passwd: "airavata"
+#client_truststore: "client_truststore.jks"
+client_truststore: "airavata.jks"
+client_truststore_passwd: "airavata"
+cred_keystore: "airavata_sym.jks"
+cred_keystore_passwd: "airavata"
+cred_keystore_alias: "airavata"
+cred_store_server_host: "{{ ansible_fqdn }}"
+cred_store_port: "8960"
+keystores_location: "{{ deployment_dir }}/keystores"
+
+# Gfac related variables
+gfac_name: "gfac-node0"
+gfac_host: "{{ ansible_fqdn }}"
+gfac_port: "8950"
+gfac_dir: "{{ deployment_dir }}/gfac-instance"
+
+# Monitoring variables
+monitor_email_address: "test.airavata@gmail.com"
+monitor_email_password: "airavata"

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/inventories/develop/group_vars/dev-airavata.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/develop/group_vars/dev-airavata.yml b/dev-tools/ansible/inventories/develop/group_vars/dev-airavata.yml
new file mode 100644
index 0000000..06586ec
--- /dev/null
+++ b/dev-tools/ansible/inventories/develop/group_vars/dev-airavata.yml
@@ -0,0 +1,2 @@
+airavata_source_dir: "/home/airavata/dev-airavata-source"
+deployment_dir: "/home/airavata/dev-deployment"

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/inventories/develop/group_vars/dev-pga.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/develop/group_vars/dev-pga.yml b/dev-tools/ansible/inventories/develop/group_vars/dev-pga.yml
new file mode 100644
index 0000000..7b82521
--- /dev/null
+++ b/dev-tools/ansible/inventories/develop/group_vars/dev-pga.yml
@@ -0,0 +1,3 @@
+portals_dir: /home/pga/portals
+git_branch: develop
+airavata_php_gateway_repo: https://git-wip-us.apache.org/repos/asf/airavata-php-gateway.git

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/inventories/develop/group_vars/local.yml.template
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/develop/group_vars/local.yml.template b/dev-tools/ansible/inventories/develop/group_vars/local.yml.template
new file mode 100644
index 0000000..d7ff4e9
--- /dev/null
+++ b/dev-tools/ansible/inventories/develop/group_vars/local.yml.template
@@ -0,0 +1,4 @@
+---
+
+airavata_source_dir: "/Users/machrist/Documents/Airavata/airavata"
+deployment_dir: "/Users/machrist/Documents/Airavata/LocalAiravata"

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/inventories/testing-0.17/group_vars/all.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/all.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/all.yml
new file mode 100644
index 0000000..6818d31
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/all.yml
@@ -0,0 +1,91 @@
+---
+
+user: centos
+group: centos
+user_home: "/home/{{ user }}"
+
+# deployment related variables
+deployment_dir: "{{ user_home }}/deployment"
+airavata_source_dir: "{{ user_home }}/source"
+airavata_repo: "https://git-wip-us.apache.org/repos/asf/airavata.git"
+airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
+old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+git_branch: develop
+
+# Database related variables
+db_server: "{{ groups['database'][0] }}"
+db_server_port: "3306"
+db_user: "airavata"
+db_password: "airavata"
+app_catalog: "app_catalog"
+exp_catalog: "exp_catalog"
+replica_catalog: "replica_catalog"
+sharing_catalog: "sharing_catalog"
+workflow_catalog: "wf_catalog"
+credential_store: "credential_store"
+
+mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
+
+# Rabbitmq related vareables
+rabbitmq_server: "{{ ansible_fqdn }}"
+rabbitmq_vhost: "develop"
+rabbitmq_user: "airavata"
+rabbitmq_password: "airavata"
+rabbitmq_port: "5672"
+rabbitmq_broker_url: "amqp://{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ rabbitmq_server}}:{{
rabbitmq_port }}/{{ rabbitmq_vhost }}"
+
+# Zoookeeper related variables
+zookeeper_client_port: 2181
+zookeeper_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
+# API Server related variables
+api_server_name: "apiserver-node0"
+api_server_host: "{{ansible_fqdn}}"
+api_server_port: "8930"
+api_secured: "false"
+tls_enable: "false"
+api_server_tls_port: "9930"
+enable_sharing: "true"
+
+# Orchestrator  related variables
+orchestrator_name: "orchestrator-node0"
+orchestrator_host: "{{ansible_fqdn}}"
+orchestrator_port: "8940"
+api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
+api_orch_server_names: "api-orch"
+
+# registry related variables
+registry_name: regserver-node0
+registry_host: "{{ ansible_fqdn }}"
+registry_port: 8970
+#registry_dir: "{{ deployment_dir }}/registry"
+default_gateway: "php_reference_gateway"
+
+# Credential and keystore related variables
+#authorization_server: "https://{{ groups['wso2is'][0]}}:9443/services/"
+authorization_server: "https://idp.scigap.org:9443/services/"
+keystore: "airavata.jks"
+keystore_passwd: "airavata"
+#client_truststore: "client_truststore.jks"
+client_truststore: "airavata.jks"
+client_truststore_passwd: "airavata"
+cred_keystore: "airavata_sym.jks"
+cred_keystore_passwd: "airavata"
+cred_keystore_alias: "airavata"
+cred_store_server_host: "{{ ansible_fqdn }}"
+cred_store_port: "8960"
+keystores_location: "{{ deployment_dir }}/keystores"
+
+# Gfac related variables
+gfac_name: "gfac-node0"
+gfac_host: "{{ ansible_fqdn }}"
+gfac_port: "8950"
+gfac_dir: "{{ deployment_dir }}/gfac-instance"
+
+# Monitoring variables
+monitor_email_address: "test.airavata@gmail.com"
+monitor_email_password: "airavata"
+
+# Sharing Registry related variables
+sharing_registry_host: "{{ ansible_fqdn }}"
+sharing_registry_port: 7878

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/inventories/testing-0.17/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/hosts b/dev-tools/ansible/inventories/testing-0.17/hosts
new file mode 100644
index 0000000..b392006
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17/hosts
@@ -0,0 +1,20 @@
+[zookeeper]
+149.165.168.5 ansible_user=centos
+
+[rabbitmq]
+149.165.168.5 ansible_user=centos
+
+[database]
+149.165.168.5 ansible_user=centos
+
+[api-orch]
+149.165.168.5 ansible_user=centos
+
+[gfac]
+149.165.168.5 ansible_user=centos
+
+# NOTE: the registry is NOT deployed separately from the API server, but some
+# of the playbooks assume that there is a 'registry' group, so this entry
+# needs to be here as a workaround
+[registry]
+149.165.168.5 ansible_user=centos

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/roles/api-orch/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/defaults/main.yml b/dev-tools/ansible/roles/api-orch/defaults/main.yml
new file mode 100644
index 0000000..26f5c7c
--- /dev/null
+++ b/dev-tools/ansible/roles/api-orch/defaults/main.yml
@@ -0,0 +1 @@
+api_orch_server_names: "api-orch"

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
index bf92e39..cb69c9f 100644
--- a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
@@ -50,6 +50,11 @@ default.registry.user=admin
 default.registry.password=admin
 default.registry.password.hash.method=SHA
 default.registry.gateway={{ default_gateway }}
+super.tenant.gatewayId={{ default_gateway }}
+
+# Properties for cluster status monitoring
+# cluster status monitoring job repeat time in seconds
+cluster.status.monitoring.repeat.time=18000
 
 ###########################################################################
 #  Application Catalog DB Configuration
@@ -104,6 +109,13 @@ sharingcatalog.jdbc.password={{ db_password }}
 sharingcatalog.validationQuery=SELECT 1 from CONFIGURATION
 
 ###########################################################################
+#  Sharing Registry Server Configuration
+###########################################################################
+sharing_server=org.apache.airavata.sharing.registry.server.SharingRegistryServer
+sharing.registry.server.host={{ sharing_registry_host }}
+sharing.registry.server.port={{ sharing_registry_port }}
+
+###########################################################################
 #  User Profile MongoDB Configuration
 ###########################################################################
 userprofile.mongodb.host=localhost

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/roles/database/files/MariaDB_yum_CentOS_7.repo
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/database/files/MariaDB_yum_CentOS_7.repo b/dev-tools/ansible/roles/database/files/MariaDB_yum_CentOS_7.repo
new file mode 100644
index 0000000..886d14b
--- /dev/null
+++ b/dev-tools/ansible/roles/database/files/MariaDB_yum_CentOS_7.repo
@@ -0,0 +1,7 @@
+# MariaDB 10.0 CentOS repository list - created 2017-03-06 19:32 UTC
+# http://downloads.mariadb.org/mariadb/repositories/
+[mariadb]
+name = MariaDB
+baseurl = http://yum.mariadb.org/10.0/centos7-amd64
+gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
+gpgcheck=1

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/roles/database/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/database/tasks/main.yml b/dev-tools/ansible/roles/database/tasks/main.yml
index 17e5b0d..91e52c2 100644
--- a/dev-tools/ansible/roles/database/tasks/main.yml
+++ b/dev-tools/ansible/roles/database/tasks/main.yml
@@ -24,13 +24,23 @@
   become_user: root
   # when: ansible_os_family == 'RedHat'
 
+- name: Add MariaDB yum repository on CentOS
+  copy: src="MariaDB_yum_CentOS_{{ ansible_distribution_major_version }}.repo"
+        dest="/etc/yum.repos.d/"
+  become_user: root
+  when: ansible_distribution == 'CentOS'
+
 - name: install mariadb
   yum: name="{{ item }}" state=latest update_cache=yes
   with_items: "{{ mysql_packages }}"
   become_user: root
 
+# TODO: SELinux issue for 10.0.29 MariaDB, need to allow setgid/setuid.
+# See https://www.rootusers.com/how-to-fix-mariadb-10-0-29-selinux-update-failure/
+# and https://jira.mariadb.org/browse/MDEV-11789
+# For now I'm not adding to Ansible script since this bug should be fixed in next MariaDB
release
 - name: start mariadb
-  service: name=mariadb state=started enabled=yes
+  service: name=mysql state=started enabled=yes
   become_user: root
 
 - include: secure_install.yml

http://git-wip-us.apache.org/repos/asf/airavata/blob/13251fab/dev-tools/ansible/roles/database/vars/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/database/vars/main.yml b/dev-tools/ansible/roles/database/vars/main.yml
index 1f37424..d7f814d 100644
--- a/dev-tools/ansible/roles/database/vars/main.yml
+++ b/dev-tools/ansible/roles/database/vars/main.yml
@@ -1,7 +1,7 @@
 ---
 mysql_packages:
-  - mariadb-server
-  - mariadb
+  - MariaDB-server
+  - MariaDB-client
 mysql_root_password: "admin"
 
 mysql_databases:
@@ -10,6 +10,7 @@ mysql_databases:
     - "{{ replica_catalog }}"
     - "{{ workflow_catalog }}"
     - "{{ credential_store }}"
+    - "{{ sharing_catalog }}"
 
 mysql_privs:
     - "{{ app_catalog }}.*:ALL"
@@ -17,5 +18,6 @@ mysql_privs:
     - "{{ replica_catalog }}.*:ALL"
     - "{{ workflow_catalog }}.*:ALL"
     - "{{ credential_store }}.*:ALL"
+    - "{{ sharing_catalog }}.*:ALL"
 
 ...


Mime
View raw message