airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [airavata] branch master updated: changing ultrascan gateway to point to production stack
Date Sat, 09 Dec 2017 18:42:47 GMT
This is an automated email from the ASF dual-hosted git repository.

smarru pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/master by this push:
     new 0e35b48  changing ultrascan gateway to point to production stack
0e35b48 is described below

commit 0e35b485cc0d355fa45d06697b9aa80888a587e5
Author: Suresh Marru <smarru@apache.org>
AuthorDate: Sat Dec 9 13:42:39 2017 -0500

    changing ultrascan gateway to point to production stack
---
 .../production/pga_config/ultrascan/vars.yml       | 34 +++++++++-------------
 .../production/pga_config/ultrascan/vault.yml      | 34 +++++++++++-----------
 2 files changed, 31 insertions(+), 37 deletions(-)

diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
index 1560124..b643a73 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
@@ -19,16 +19,8 @@
 #
 
 ---
-
-# NOTE Ultrascan is pointed to gw153
-airavata_server: "gw153.iu.xsede.org"
-airavata_port: "8930"
-
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-# Keep Ultrascan PGA on 0.17 until gw153 gets updated/migrated
-git_branch: "branch-0.17"
-pga_config_template: "{{ inventory_dir }}/files/pga_config_0.17.php.j2"
-auth_verify_peer: "false"
+git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
@@ -40,34 +32,36 @@ ssl_certificate_chain_file: "/etc/pki/tls/certs/ultrascan_scigap_org_interm.cer"
 ssl_certificate_key_file: "/etc/pki/tls/private/ultrascan.scigap.key"
 
 ## Keycloak related variables
-tenant_domain: "prod.ultrascan"
-admin_username: "uslimsadmin"
+tenant_domain: "{{ gateway_id }}"
+admin_username: "admin"
 admin_password: "{{ vault_admin_password }}"
 oauth_client_key: "{{ vault_oauth_client_key }}"
 oauth_client_secret: "{{ vault_oauth_client_secret }}"
 oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
 
 auth_options:
-  - name: "Ultrascan"
+  - name: "Ultrascan Gateway"
     oauth_grant_type: "password"
+  - name: "CILogon"
+    oauth_grant_type: "authorization_code"
+    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
+    logo: "/assets/cilogon-logo-24x24-b.png"
 oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
 
-# With Keycloak, we have to have static role names
-#user_role_name: "airavata-user"
-
-gateway_id: "Ultrascan_Production"
+gateway_id: "ultrascan"
 # relative to document root dir
 experiment_data_dir: "{{ user_data_dir }}/ultrascan"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_5ef8ddd3-2a2a-48ca-9c5f-becce690c6c1"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCHxpxod4TZ9Iy0TyqEK1uyKEeq41QRUlD9sHZmuF3aeXpbnleOW1F8NQrpUuzCrcT+xb8Owam8rCB3xe73ZWzf4BJBjt8MJ481kGgufZzzIAuTHcewEzjoabTrg+3b8eQsq9uWyJc96/SEzKlryOkyZL6MptCE8kbcquD/Jo6ADMpAAS9rDmSaWg5dPbITrF2o2r1cHKeHkri45b6+ih63Mf/pYhbHTPsheaQu3Kyk1YmdP25pgzD65SMZSeZan8St4mPDdGMOwfvjIkhvoyPXoyaCqTwnQ3bfwlL/xmbxtGWPax73pgitlhtKynRRWgse8uc6rIQxzXsKkAHbB/R3"
-
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCloIIv+f8p/YbCyn0i1tOdwGW0mi/KdZCO8X0e7pPLhL7UZmrjKPCBWqlH92EKr6RnCENx5YCmmRm7DOqm1RuuER//2bxd5w+VmURAmuM1MdVpMocT6z9a51F9YEbfQfTLzES6fXyeRqq7aMljqYWovdM6uSFuIahvaTOwU0G/VrW0NBc411K0Kl1fWxpbPVy+ZCJJzCyP7JBV6sZMFFhT1/VQwsp1/0bBZwTPvaVwPcfibp65t99k4oxhGFVBhxBQ9KCki1uMr0sXJqB3udbBW26CFL9NHFttEuPjXRU+wQBkdsTfGzpbpjQZ7isCDDLWMMKiHXqwqU+6tH1biGUX"
 data_sharing_enabled: "false"
 
 ## Portal related variables
-super_admin_portal: "true"
+super_admin_portal: "false"
 admin_emails: "['sgrc-iu-group@iu.edu']"
 portal_email_username: "pga.airavata@gmail.com"
 portal_email_password: "{{ vault_portal_email_password }}"
 portal_theme: "base"
 portal_title: "Ultrascan SciGaP Dashboard"
 ...
+
+
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vault.yml
b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vault.yml
index d8a11b1..f26d6f7 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vault.yml
@@ -1,18 +1,18 @@
 $ANSIBLE_VAULT;1.1;AES256
-32646566346165633263613063613465353634316261333737653431646232653433346636616635
-3136393565636162623536376661386138383733393637610a646138353030353138373739393839
-64353833616133633431333032306635333630313835333865313031363733373436303266616466
-3863366437643233630a366265316631336162623666303064343861646234326132663863346236
-63313364303063636136666365343164616336613837373133376232343165666139316165663961
-30316435313838656437346437363365663835656138353937643238363564373363623965336262
-34383964383363323862353932363538613432373765383762323138343435333239663939373533
-62373264353763363666623063393934376631336133623237353365663365303063366233336131
-30373836353566643430336436646138633237356265306438383937393937646234663831336436
-38616438663836313866393563363036396131373164616563653162333835656130376132316430
-65353864313337303366386566646435643065636662316563333734383432346431373536356533
-36393131383131663132613939386537336131353961653537646230326632373966303937613532
-62396436656161663264393335366633323533636666613364303364316134306439306334663065
-30623065333537643930373962663264343766356636333937383135333164363635396536316338
-36353436626436303938316638383632316233623562353930376238373038633964303431366135
-63623162306335353234393737623137356361653162633436666132333737316461663061373562
-32363836376238396239616163666338393839343865353866326166353532656361
+62623564396339653035663030366136343331363639643533386336646138646665346162393138
+3766653338323031626433346664643861313134306663610a613161376332313230633834396263
+39373533666263643439323035353134326438306234613636373337653639373762386237663831
+6139646232313737310a393535333662396535613434633532363038373933643835346236323935
+37653162613031643439613238316632643033396236653233356165653038316630643337313135
+39336266333735643063623666613634316636396134376264626638626161666232656163363266
+61616539363035363162616338633830386432643737396532373534656135306636316130306432
+37663762336163303561346633323466633765633465633937616131363739353536636134626230
+34353465323964656366643833303039336164626630373334653563343766383564313138623034
+38373239383936356634663162373063646165656630383134396163366561626634633565643566
+39663861343936306363313035343463353962653236663263313335303732663233306662393230
+32623635396339623035383233343434333561373164623138326161303334643063373865356166
+30626531373035653036383061366632616239626462336565383031623466333862353434386363
+33666135366164343136666637636665353031393739626463646663373765363366366664663062
+34316630613761306466356137643730396161616432656437336565373231336636653233636535
+34623734616461653837303431653139383564303837623761393762383633653264323431613532
+3332

-- 
To stop receiving notification emails like this one, please contact
['"commits@airavata.apache.org" <commits@airavata.apache.org>'].

Mime
View raw message