You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/05/02 19:57:48 UTC
airavata git commit: AIRAVATA-2371 Adding profile service to api-orch, ansible
Repository: airavata
Updated Branches:
refs/heads/develop 81a5f2bcf -> 57dc7672e
AIRAVATA-2371 Adding profile service to api-orch, ansible
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/57dc7672
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/57dc7672
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/57dc7672
Branch: refs/heads/develop
Commit: 57dc7672e43cb433ba0cae1d1db7519441c20a07
Parents: 81a5f2b
Author: Marcus Christie <ma...@apache.org>
Authored: Tue May 2 15:55:39 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue May 2 15:55:39 2017 -0400
----------------------------------------------------------------------
.../testing-0.17/group_vars/all/vars.yml | 1 +
.../templates/airavata-server.properties.j2 | 26 +++++++++++++++++++-
dev-tools/ansible/roles/database/vars/main.yml | 2 ++
.../main/resources/airavata-server.properties | 2 ++
.../org/apache/airavata/server/ServerMain.java | 2 +-
5 files changed, 31 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/57dc7672/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
index 71f8dad..c541548 100644
--- a/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
@@ -44,6 +44,7 @@ replica_catalog: "master_replica_catalog"
sharing_catalog: "sharing_catalog"
workflow_catalog: "master_wf_catalog"
credential_store: "master_credential_store"
+profile_service: "profile_service"
mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
http://git-wip-us.apache.org/repos/asf/airavata/blob/57dc7672/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 f7ffb67..ffdb1a0 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
@@ -301,6 +301,30 @@ trust.store.password=airavata
authz.cache.enabled=true
authz.cache.manager.class=org.apache.airavata.api.server.security.authzcache.DefaultAuthzCacheManager
in.memory.cache.size=1000
-
#### remote idp service url for KeyCloak based setup####
remote.idp.service.url={{ remote_idp_service_url }}
+
+# Kafka Logging related configuration
+isRunningOnAws=false
+kafka.broker.list=localhost:9092
+kafka.topic.prefix=local
+enable.kafka.logging=false
+
+###########################################################################
+# Profile Service Configuration
+###########################################################################
+profile.service.server.host=localhost
+profile.service.server.port=8962
+profile_service=org.apache.airavata.service.profile.server.ProfileServiceServer
+# mysql properties
+credential.store.jdbc.url=jdbc:mysql://{{ db_server }}:3306/{{ profile_service }}
+credential.store.jdbc.user={{ db_user }}
+credential.store.jdbc.password={{ db_password }}
+credential.store.jdbc.driver=com.mysql.jdbc.Driver
+profile.service.validationQuery=SELECT 1
+
+###########################################################################
+# Iam Admin services Configuration
+###########################################################################
+iam.server.url=https://iam.scigap.org/auth
+new.gateway.admin.temp.password=Password@123
http://git-wip-us.apache.org/repos/asf/airavata/blob/57dc7672/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 ad2ea43..1cc1ff2 100644
--- a/dev-tools/ansible/roles/database/vars/main.yml
+++ b/dev-tools/ansible/roles/database/vars/main.yml
@@ -30,6 +30,7 @@ mysql_databases:
- "{{ workflow_catalog }}"
- "{{ credential_store }}"
- "{{ sharing_catalog }}"
+ - "{{ profile_service }}"
mysql_privs:
- "{{ app_catalog }}.*:ALL"
@@ -38,5 +39,6 @@ mysql_privs:
- "{{ workflow_catalog }}.*:ALL"
- "{{ credential_store }}.*:ALL"
- "{{ sharing_catalog }}.*:ALL"
+ - "{{ profile_service }}.*:ALL"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/57dc7672/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index 30518f1..9d0a9f3 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -325,6 +325,8 @@ authorization.policy=airavata-default-xacml-policy
authz.cache.enabled=true
authz.cache.manager.class=org.apache.airavata.api.server.security.authzcache.DefaultAuthzCacheManager
in.memory.cache.size=1000
+#### remote idp service url for KeyCloak based setup####
+remote.idp.service.url={{ remote_idp_service_url }}
# Kafka Logging related configuration
isRunningOnAws=false
http://git-wip-us.apache.org/repos/asf/airavata/blob/57dc7672/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
index 45b5164..c041622 100644
--- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
+++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
@@ -119,7 +119,6 @@ public class ServerMain {
serverList.add(API_SERVER);
serverList.add(ORCHESTRATOR);
serverList.add(GFAC_SERVER);
- serverList.add(USER_PROFILE);
serverList.add(PROFILE_SERVICE);
} else if (serverList.indexOf(API_ORCH) > -1) {
serverList.clear();
@@ -128,6 +127,7 @@ public class ServerMain {
serverList.add(SHARING_SERVER);
serverList.add(API_SERVER);
serverList.add(ORCHESTRATOR);
+ serverList.add(PROFILE_SERVICE);
} else if (serverList.indexOf(EXECUTION) > -1) {
serverList.clear();
serverList.add(GFAC_SERVER);