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/11 14:57:46 UTC
[1/2] airavata git commit: Updating test keycloak integration
deployment
Repository: airavata
Updated Branches:
refs/heads/develop a1c3e83eb -> e1a9ab485
Updating test keycloak integration deployment
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5f8d5c6a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5f8d5c6a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5f8d5c6a
Branch: refs/heads/develop
Commit: 5f8d5c6acd9d9bfc5c2d3e241ad684a230020796
Parents: a1c3e83
Author: Marcus Christie <ma...@apache.org>
Authored: Thu May 11 10:51:19 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu May 11 10:51:19 2017 -0400
----------------------------------------------------------------------
.../testing-0.17/group_vars/all/vars.yml | 2 +-
.../testing-0.17/group_vars/pga/vars.yml | 6 ++--
.../testing-0.17/group_vars/pga/vault.yml | 34 ++++++++++----------
3 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5f8d5c6a/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 8f94011..d063986 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
@@ -63,7 +63,7 @@ zookeeper_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
api_server_name: "apiserver-node0"
api_server_host: "{{ansible_fqdn}}"
api_server_port: "8930"
-api_secured: "true"
+api_secured: "false"
tls_enable: "false"
api_server_tls_port: "9930"
enable_sharing: "true"
http://git-wip-us.apache.org/repos/asf/airavata/blob/5f8d5c6a/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
index b8df166..a9d8ede 100644
--- a/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
@@ -29,13 +29,13 @@ vhost_servername: "{{ groups['pga'][0] }}"
vhost_ssl: False
## Keycloak related variables
-tenant_domain: "test.seagrid"
-admin_username: "admin"
+tenant_domain: "prod.seagrid"
+admin_username: "prod.seagrid.admin"
admin_password: "{{ vault_admin_password }}"
oauth_client_key: "{{ vault_oauth_client_key }}"
oauth_client_secret: "{{ vault_oauth_client_secret }}"
oauth_grant_type: "password"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/test.seagrid/.well-known/openid-configuration"
+oidc_discovery_url: "https://iam.scigap.org/auth/realms/prod.seagrid/.well-known/openid-configuration"
## Airavata Client related variables
#airavata_server: "tls://gw77.iu.xsede.org"
http://git-wip-us.apache.org/repos/asf/airavata/blob/5f8d5c6a/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vault.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vault.yml
index 81eb757..31a7704 100644
--- a/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vault.yml
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vault.yml
@@ -1,18 +1,18 @@
$ANSIBLE_VAULT;1.1;AES256
-66323164653465383233363936613135323165616436656330613134616330323636353838306539
-6661303966346337656263653330376633316666373132330a636166653364333263383838396537
-65376661636434333635656337363635646531626164346163363530353533356261643431653436
-3966623863396366340a356161633331383937396537343462663633373536343631303337646536
-65653566393331366337623933373166393231366339383533323863313334623662353466613636
-34633339663661313065346139323731336338363166353332383566353266646533633534616331
-31636437303930636262333338346666366337376135633837386134333133333165333038366136
-62356665376266353234643431636438643332633634363131323436383331623832353362656439
-31653638343638316361623366393733643066376336366334636532666332636262363939326232
-33393639346463383762316166616231396130386166343532393830333933613334303465383833
-62636162323036613439366366353133303661663331663764326532363036643632343836316637
-39633738623033343261306330323839616232646263303263623538333330393361353635353766
-66616433316665333665373534323735633835353335353164343138653764303331393937636261
-61393063376232633435393733633438363630306538653065353238646634313737356535653131
-39666533356336636639383766393436613361636338616539343365633266343463376230646539
-62393962303137336366356232633966646263313432383035343530383539373839333333366530
-3230
+39663062643334653464373762356462383964313737616161623035306236633531653431616238
+3433326431356162373964373363316266626362613436370a356664613636623064303666383633
+30656232653065663130626334633235376139663730613032303263666361336262316261646537
+6163393337353134300a313964643764356466373962376662363136313032363734323266343062
+65623638343163626261623434323535373438313935396631356461333032633965333132343661
+35643638343039633562386437666232353930366161313339313439343562616530353830623062
+61643630393661613161623737323537623035353631356533656130636131643233356130653335
+32643565623361346362666163376464666262393739306331313132363830306339333538613166
+62646262353639366434653636353633653566343536616666303133333932353036313965383936
+66333734663461323361643832366337363136353434363066313636323831613438333739626633
+37326666666336353961316139396366353233376161616230623638333532323866633135663162
+32383838396132346533623164666165346432323166353236343235366137666330656231366135
+33323433653939353066333238383735623731656464653938373361353633383261333739633566
+39373435363731653137383033623766316361356232323164333061306239646566333731643738
+62383437343461363462343038623735626564666463373464353138316366643730323931393836
+63366263343839383835393533383533623466643032623433323534323665346463343666333037
+3733
[2/2] airavata git commit: AIRAVATA-2371 Updating to new name of
authz.cache.manager.class
Posted by ma...@apache.org.
AIRAVATA-2371 Updating to new name of authz.cache.manager.class
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e1a9ab48
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e1a9ab48
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e1a9ab48
Branch: refs/heads/develop
Commit: e1a9ab48529d998b09b310ad15427efa2587df8f
Parents: 5f8d5c6
Author: Marcus Christie <ma...@apache.org>
Authored: Thu May 11 10:55:03 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu May 11 10:55:03 2017 -0400
----------------------------------------------------------------------
.../ansible/roles/api-orch/templates/airavata-server.properties.j2 | 2 +-
.../ansible/roles/gfac/templates/airavata-server.properties.j2 | 2 +-
.../server/src/main/resources/airavata-server.properties | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a9ab48/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 089d1e4..aeaeb1a 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
@@ -299,7 +299,7 @@ trust.store={{ keystores_location }}/{{ client_truststore_src_path | basename }}
trust.store.password=airavata
#### authorization cache related configuration ####
authz.cache.enabled=true
-authz.cache.manager.class=org.apache.airavata.api.server.security.authzcache.DefaultAuthzCacheManager
+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 }}
http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a9ab48/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
index ba11ed3..05a42c7 100644
--- a/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
@@ -293,5 +293,5 @@ trust.store={{ keystores_location }}/{{ client_truststore_src_path | basename }}
trust.store.password=airavata
#### authorization cache related configuration ####
authz.cache.enabled=true
-authz.cache.manager.class=org.apache.airavata.api.server.security.authzcache.DefaultAuthzCacheManager
+authz.cache.manager.class=org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager
in.memory.cache.size=1000
http://git-wip-us.apache.org/repos/asf/airavata/blob/e1a9ab48/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 4aeb06c..47bf83e 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -316,7 +316,7 @@ remote.oauth.authorization.server=https://idp.scigap.org:9443/services/
authorization.policy=airavata-default-xacml-policy
#### authorization cache related configuration ####
authz.cache.enabled=true
-authz.cache.manager.class=org.apache.airavata.api.server.security.authzcache.DefaultAuthzCacheManager
+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 }}