airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [2/4] airavata git commit: Removing unused remote.idp.service.url, using iam.server.url instead
Date Fri, 16 Jun 2017 15:36:05 GMT
Removing unused remote.idp.service.url, using iam.server.url instead


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

Branch: refs/heads/develop
Commit: ae2e0e617f6581cb64a7c9abaeb8dc4e675b5a9d
Parents: 649d579
Author: Marcus Christie <machristie@apache.org>
Authored: Fri Jun 16 10:42:50 2017 -0400
Committer: Marcus Christie <machristie@apache.org>
Committed: Fri Jun 16 10:42:50 2017 -0400

----------------------------------------------------------------------
 .../ansible/inventories/scigap/develop/group_vars/all/vars.yml   | 2 +-
 .../inventories/testing-0.17-scigap/group_vars/all/vars.yml      | 2 +-
 .../ansible/inventories/testing-0.17/group_vars/all/vars.yml     | 2 +-
 dev-tools/ansible/roles/api-orch/defaults/main.yml               | 2 +-
 .../roles/api-orch/templates/airavata-server.properties.j2       | 4 +---
 .../server/src/main/resources/airavata-server.properties         | 2 --
 6 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/ae2e0e61/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
index 4df4707..01a2fe6 100644
--- a/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
@@ -71,7 +71,7 @@ api_secured: "false"
 tls_enable: "true"
 api_server_tls_port: "9930"
 enable_sharing: "true"
-remote_idp_service_url: "https://iamdev.scigap.org/auth"
+iam_server_url: "https://iamdev.scigap.org/auth"
 
 # Orchestrator  related variables
 orchestrator_name: "orchestrator-node0"

http://git-wip-us.apache.org/repos/asf/airavata/blob/ae2e0e61/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/all/vars.yml b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/all/vars.yml
index 4875386..03ee952 100644
--- a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/all/vars.yml
@@ -66,7 +66,7 @@ api_secured: "false"
 tls_enable: "false"
 api_server_tls_port: "9930"
 enable_sharing: "true"
-remote_idp_service_url: "https://iam.scigap.org/auth"
+iam_server_url: "https://iam.scigap.org/auth"
 
 # Orchestrator  related variables
 orchestrator_name: "orchestrator-node0"

http://git-wip-us.apache.org/repos/asf/airavata/blob/ae2e0e61/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 d063986..7d04994 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
@@ -67,7 +67,7 @@ api_secured: "false"
 tls_enable: "false"
 api_server_tls_port: "9930"
 enable_sharing: "true"
-remote_idp_service_url: "https://iam.scigap.org/auth"
+iam_server_url: "https://iam.scigap.org/auth"
 
 # Orchestrator  related variables
 orchestrator_name: "orchestrator-node0"

http://git-wip-us.apache.org/repos/asf/airavata/blob/ae2e0e61/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
index 37235dc..dbe9406 100644
--- a/dev-tools/ansible/roles/api-orch/defaults/main.yml
+++ b/dev-tools/ansible/roles/api-orch/defaults/main.yml
@@ -21,7 +21,7 @@
 api_orch_server_names: "api-orch"
 api_orch_log_dir: "{{ api_orch_dir }}/{{ airavata_dist }}/logs"
 
-remote_idp_service_url: "https://iam.scigap.org/auth"
+iam_server_url: "https://iam.scigap.org/auth"
 
 profile_service_host: "localhost"
 profile_service_port: 8962

http://git-wip-us.apache.org/repos/asf/airavata/blob/ae2e0e61/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 d09d814..2df9f4d 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,8 +301,6 @@ trust.store.password=airavata
 authz.cache.enabled=true
 authz.cache.manager.class=org.apache.airavata.service.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
@@ -326,5 +324,5 @@ profile.service.validationQuery=SELECT 1
 ###########################################################################
 # Iam Admin services Configuration
 ###########################################################################
-iam.server.url=https://iam.scigap.org/auth
+iam.server.url={{ iam_server_url }}
 new.gateway.admin.temp.password=Password@123

http://git-wip-us.apache.org/repos/asf/airavata/blob/ae2e0e61/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 15fcfe2..26d8222 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -318,8 +318,6 @@ authorization.policy=airavata-default-xacml-policy
 authz.cache.enabled=true
 authz.cache.manager.class=org.apache.airavata.service.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


Mime
View raw message