airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [1/5] airavata git commit: AIRAVATA-2431 Ansible test deploy for user migration
Date Sun, 11 Jun 2017 20:11:11 GMT
Repository: airavata
Updated Branches:
  refs/heads/develop da720e3a6 -> 3eb804ba5


AIRAVATA-2431 Ansible test deploy for user migration


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

Branch: refs/heads/develop
Commit: f089bb1a9cae11ba0a1f22c4866b65b279ebdec9
Parents: da720e3
Author: Marcus Christie <machristie@apache.org>
Authored: Sun Jun 11 14:09:37 2017 -0400
Committer: Marcus Christie <machristie@apache.org>
Committed: Sun Jun 11 14:09:37 2017 -0400

----------------------------------------------------------------------
 .../testing-0.17-scigap/group_vars/all/vars.yml |  5 +++
 .../testing-0.17-scigap/group_vars/pga/vars.yml | 18 +++++++----
 .../group_vars/pga/vault.yml                    | 34 ++++++++++----------
 .../testing-0.17/group_vars/pga/vault.yml       | 34 ++++++++++----------
 .../user-profile-migration.properties.template  |  1 +
 5 files changed, 51 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/f089bb1a/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 18fb094..4875386 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,6 +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"
 
 # Orchestrator  related variables
 orchestrator_name: "orchestrator-node0"
@@ -109,3 +110,7 @@ monitor_email_password: "airavata"
 # Sharing Registry related variables
 sharing_registry_host: "{{ ansible_fqdn }}"
 sharing_registry_port: 7878
+
+# Profile Service related variables
+profile_service_host: "{{ ansible_fqdn }}"
+profile_service_port: 8962

http://git-wip-us.apache.org/repos/asf/airavata/blob/f089bb1a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vars.yml
index e3a7317..56a778d 100644
--- a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vars.yml
@@ -20,24 +20,28 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "develop"
-pga_user: "pga"
-pga_group: "pga"
+git_branch: "keycloak-integration"
+user: "pga"
+group: "pga"
 doc_root_dir: "/var/www/html/php-gateway"
 user_data_dir: "/var/www/user_data"
-#vhost_servername: "{{ groups['pga'][0] }}"
+vhost_servername: "{{ groups['pga'][0] }}"
+vhost_ssl: False
 
-## WSO2 IS related variables
-tenant_domain: ""
+## Keycloak related variables
+tenant_domain: "scigap"
 admin_username: "scigap_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/scigap/.well-known/openid-configuration"
 
 ## Airavata Client related variables
 #airavata_server: "tls://gw77.iu.xsede.org"
 airavata_server: "{{ groups['api-orch'][0] }}"
-airavata_port: "8930"
+airavata_port: "{{ api_server_port }}"
+airavata_profile_service_port: "{{ profile_service_port }}"
 gateway_id: "scigap"
 # relative to document root dir
 experiment_data_dir: "{{ user_data_dir }}"

http://git-wip-us.apache.org/repos/asf/airavata/blob/f089bb1a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vault.yml b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vault.yml
index a30ba69..32c86bc 100644
--- a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vault.yml
+++ b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vault.yml
@@ -1,18 +1,18 @@
 $ANSIBLE_VAULT;1.1;AES256
-64653833663230383465353266623839636163316364356431373837653638306130616130383963
-3132323230336531646162616464633061623830653462640a663263373436653831643063616638
-31383336306438613732613839396336626566313737316363636430393136633632613130326237
-6539306131633433660a633734643961633161323161643433613938626166343961663337376266
-63323163343633666330313666306234373663303738303033343662366139636534646162663230
-66343034666431326666626261303061343334643461343633663436616430323339613732306437
-31633431613463666139646638643037336435346564383631653664633135333734356434373461
-35373963313361393331656463386234383962663039636164626239393465333137333839616439
-38356531643032363839363862376263336565396464623332336533333837333937623635636366
-61313532633161336631363561353139376637623562346438623865343332643232653036303536
-62333865396439633435333533623338323664326231623136383761316336653334653464336363
-31313261366162386533646365386230646338646466623730306166366235623466323066656239
-66306166363630633733303261616335383839323163313239393330363730663262616133613737
-30363537623061333030363162316138353361326430636534313034613032653433326130393134
-37636364633533363263363833626237613639313638383536643637303435663831613735343261
-36363937356332313237343563356134366162633338616263613338393736646561303135383362
-35616562353739343661306330376334376361396266646230373065326364336662
+61336130613839373263663031326663303138353534373965386361396137313736323938376433
+6131613033343030313166376431666634356662323463360a333034626638616633663564303338
+62323730343237346537363637636165383736363033373166613363626238313333613764376239
+3561613032616239300a336639623963633036346131333737643337643332366664353830303330
+30386230653631396336383362306531306366336533376338393233343465633539663634656637
+37326636643737643163643766376337623435356536326366363032623939323135626663633165
+63636438323961376364363939626530396266373163663435323362646364316633303136653764
+66663633616432373861343233666661613664613232383539313931613934653836636566343262
+65316330653261393861653833396563303839323761636333613737663433323362356531383266
+31656633333234376233323930313539353739363839333231343733323732353363383264366436
+30653864333033323536396362616531336330326565653135303263346464656333346431323139
+37666666616566616634313632363936666430346237363062303132666238663833633031313531
+35643634613937363562363137363034336539383537363239356139343037316433623261343636
+62333936366338616136396430643239336364386133613664393438396435323163653137656638
+36303133313830366564623861653766343939616637616264623666633166653764313731303365
+64353132393065396464653933623762623366633831373431323937393133353536646661356461
+3539

http://git-wip-us.apache.org/repos/asf/airavata/blob/f089bb1a/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 2bd58bc..6647c9f 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
-66616234663230306438343338303935666230346437383137386336613866393239353865646264
-3361383464356239333363623665396339666339316333380a373161353463643264353663373838
-65356231666265356430313837623834346335663030616631653235663462633830323064353232
-6435656462666235320a633162383034326561313161383332656230626132383232663335373530
-66396533656463616237313731343865343731363363313464623737613635363266333765633238
-32623137366134393031376234666230656561353463336632356232383934396239376562633234
-37613136373932383363363364333038336365633961363730346632633237393833303664343635
-36333766636530386337313066633833656435333336303664656232316666646265656335303537
-32626630316138336131386339396335396431653635633236666363383861326630336136366537
-63333337643066316436613434616238663465636538353632633061376130363365636566396632
-31376631633037626337653964333065633366653063373364626331363465333135393064666133
-35643230393237623239356533313566323537376461383363623237343966616438356136333334
-31633835633562393730663566323536376365383162363533303236353365313137643632356664
-36616539643133653263623961306264343965366533323164336565633965623761313436343865
-36383938323466373939333035353962343161656365356532363430636539633362323335373630
-37343835353034643734323932633535336463633364346564323266646563366130633034313736
-6438
+61663832613632643332616561333966306365373962613030396666656138623135636231333165
+3130366338366535366633393635636430633263376335300a326633353562363137623735326238
+30633765353633633937373561323366346163323136663930376532393661396433396432303864
+6562343965313039360a643761643336666632613366626661633633313432653135306266383064
+31323536633430656136343138313661386237313033363061633166336630353666636364646539
+39323539373632653631373636373137313138376334396466363362383635663530376435653038
+65333534313363663230303464633265336133353631316537613363643063643539616630363961
+61323739616464356161623666303366623361363966663838303863346563393739376538373830
+37653962346434396333376462373931316139646531643634626163323736336265613564313665
+34353361383732343035323938316433363030376137643738393239626131363963306131626231
+32346631653436346666616435383339666537626265336330366631353031336162383766643334
+35356665343333626565663431336436313436376236323235396132303230336364633130383663
+63383939626464636261376531336265613938393461323765343138656138376562373437373162
+64623365623165356631353435363261346165313532346237383062613966396232656461646364
+30616235626264356139313161636565613135353838613631326336346664373137346130376531
+39663362656165376137613265386237653635376361643765373033663436643162623334643430
+3964

http://git-wip-us.apache.org/repos/asf/airavata/blob/f089bb1a/modules/user-profile-migration/user-profile-migration.properties.template
----------------------------------------------------------------------
diff --git a/modules/user-profile-migration/user-profile-migration.properties.template b/modules/user-profile-migration/user-profile-migration.properties.template
index 17cef37..aeacef5 100644
--- a/modules/user-profile-migration/user-profile-migration.properties.template
+++ b/modules/user-profile-migration/user-profile-migration.properties.template
@@ -25,6 +25,7 @@ profile.service.host = localhost
 profile.service.port = 8962
 
 # Keycloak settings
+# username and password for master realm admin user
 keycloak.admin.username = username
 keycloak.admin.password = password
 keycloak.service-url = https://iam.scigap.org/auth


Mime
View raw message