airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject airavata git commit: adding accord and nanoshape gateways
Date Tue, 11 Jul 2017 15:40:16 GMT
Repository: airavata
Updated Branches:
  refs/heads/develop 5baf04d3f -> 101a687a1


adding accord and nanoshape gateways


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

Branch: refs/heads/develop
Commit: 101a687a154690946deed18a74c0f7cb013dd416
Parents: 5baf04d
Author: Suresh Marru <smarru@apache.org>
Authored: Tue Jul 11 10:40:10 2017 -0500
Committer: Suresh Marru <smarru@apache.org>
Committed: Tue Jul 11 10:40:10 2017 -0500

----------------------------------------------------------------------
 .../production/pga_config/accord/vars.yml       | 66 ++++++++++++++++++++
 .../production/pga_config/accord/vault.yml      | 18 ++++++
 .../pga_config/nanoconfinement/vars.yml         |  6 +-
 .../production/pga_config/nanoshape/vars.yml    | 65 +++++++++++++++++++
 .../production/pga_config/nanoshape/vault.yml   | 18 ++++++
 dev-tools/ansible/pga-scigap-prod.yml           | 34 +++++-----
 .../tenant_profile_model.thrift                 | 20 +++---
 7 files changed, 203 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/101a687a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
new file mode 100644
index 0000000..b598828
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
@@ -0,0 +1,66 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "develop"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/testdrive"
+vhost_servername: "accord.hpc.virginia.edu"
+vhost_serveralias: "www.accord.hpc.virginia.edu"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/letsencrypt/live/accord.hpc.virginia.edu/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/accord.hpc.virginia.edu/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/accord.hpc.virginia.edu/privkey.pem"
+
+## Keycloak related variables
+tenant_domain: "{{ gateway_id }}"
+admin_username: "tdaadmin"
+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: "Virgina Accord Science 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"
+
+gateway_id: "virginaaccord"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/testdrive"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUF51b2cYYqqadLHL9M/oPY0ZHZlWbdOdaIgjpzIzMnO7M9hKrHVY2pqyLPvqCLzaunxITPWsTqw0E8hwub4ttGLAx/O4kIf+BgyZK7iuwXWhI7u85/o58IfrD4B+jVCYKRNayuLR+lJWsiOeS6HSlunpTKTEhFGeOHn2UzdbLfgWYQ3VUFDtKN1oDPDT78ml5c2RCibJ21jltpevVfEtCUctERpTfniWSuQZggP1qiLNa1+PfiJ3mGsEzJFDntQvQetdinaAbEaT7+sctS8nBNjapkmYMf6tBl3S0bLttYPH51f8lUQAFaAzrestO1JpJNnIeY01/S3MWIlAWASnn"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['sgg@iu.edu','jaj@virginia.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "virginia-accord-gateway-theme"
+portal_theme_repo: "https://github.com/SciGaP/virginia-accord-gateway-theme.git"
+portal_title: "Virgina Accord Science Gateway"
+...

http://git-wip-us.apache.org/repos/asf/airavata/blob/101a687a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vault.yml
new file mode 100644
index 0000000..d69cc96
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+33646462616662326265303837306231346666306462653238646537616631326233623035356266
+6465633732373434303063393439653564306466376162360a396433386630363466396332366535
+38313030313531326332626635623736363166343233326338636164313032356463626665313964
+6435303232343164620a666134356263396434376662656163356430373061633466656530666535
+66303134393662323962386230393132393631373465313361373134303337323966633530386530
+65633936656261646534663663643662613437333032336132626165316631643262613961353638
+35306335323336326264643237353866326430613761323439366638316566653339366264616438
+61376463666236613765653836356435393163646337643135333137393335646464653762636238
+32656639363062353838353333336532653162363666363332333962643232386436623633656666
+38646364373862363461396537376363383833653361343139343763393265306662623835383934
+64393437323035316339643939386234333663643330366361626330373936383838396261313435
+32623236343730373835346465343233643435343637316132653063303638613235366236303732
+64626132353561663136616662636137396563386165656561366537343163656238326465616439
+37663035313933376565643239326463653037396465323636306562373532346331336233326332
+31636362626539383563633834653237636335396630316363616432363062623337303734353430
+65363232623837343830333136373535626436366531356563383161313861346134326162646239
+3461

http://git-wip-us.apache.org/repos/asf/airavata/blob/101a687a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
index f7e7eec..2755ce3 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
@@ -42,6 +42,10 @@ oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain
}}/.wel
 auth_options:
   - name: "Nano Confinement"
     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"
 
 gateway_id: "nanoconfinement"
@@ -56,6 +60,6 @@ admin_emails: "['smarru@iu.edu','sgg@iu.edu','vjadhao@iu.edu']"
 portal_email_username: "pga.airavata@gmail.com"
 portal_email_password: "{{ vault_portal_email_password }}"
 portal_theme: "nanoconfinement-gateway-theme"
-portal_theme_repo: "https://github.com/SciGaP/nanoconfinement-gateway-theme.git"
+portal_theme_repo: "https://github.com/softmaterialslab/nanoconfinement-gateway-theme.git"
 portal_title: "Nano Confinement Science Gateway"
 ...

http://git-wip-us.apache.org/repos/asf/airavata/blob/101a687a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
new file mode 100644
index 0000000..732f9fa
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
@@ -0,0 +1,65 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "develop"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/nanoshape"
+vhost_servername: "nanoshape.sciencegateways.iu.edu"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/letsencrypt/live/nanoshape.sciencegateways.iu.edu/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/nanoshape.sciencegateways.iu.edu/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/nanoshape.sciencegateways.iu.edu/privkey.pem"
+
+## Keycloak related variables
+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: "Nano Shape"
+    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"
+
+gateway_id: "nano-shape"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/nanoshape"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCIUqpKWHwawFHnbWvs6pie+fDA9NlqMZNvzil7e8FQz7543+FOzdTl/octACjGnSTwHewpyTe9sAUVcnq6VJ5XYtApR68zMasEzyCZUMWhMqEuxopRZcUGDJVcq5hD4RZcer3aMPWSVmXVCNJeT4EsB52Zp2DfDVgfaOOfY8Ga4mcR2IdOyizV8HWXTH6vWFK+dD1GoPY0ECikwlsF1QA0vzqAcb1NYOTc70hZ9Pb0/78XF790joZ80hRsHGIc7IfncoLgRUkKSkMaoXbfy/tbqf76V0ZxaQOgayaLGF19oBlREO6ZQ3rDCOWgVJC32dCwAsaL9qWd0IZrprUEUQOd"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['smarru@iu.edu','sgg@iu.edu','vjadhao@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "nanoshape-gateway-theme"
+portal_theme_repo: "https://github.com/softmaterialslab/nanoshape-gateway-theme.git"
+portal_title: "Nano Shape Science Gateway"
+...

http://git-wip-us.apache.org/repos/asf/airavata/blob/101a687a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vault.yml
b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vault.yml
new file mode 100644
index 0000000..e628705
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+37326565363634636561353861386430323939653634353334303965363765663563393333373966
+3863653537663931306530333165363932613962373236360a663961363361383838303132363132
+64376235656137323732363030333138323539653838343866393464646331303565326563393862
+6561313339666664640a323831616134306564306634383266383264353034336630646432356638
+38313037623138366632633836636238663334623933323535383238636334326364663565633761
+61393761353334343761333036373362363161356162333438623036313061613063376333643539
+38303934353932383963643935386633623530343737353436306539316334366539633861616566
+36353665323061333463363230376234643535306566306563353662646263646433646136663364
+31633531613430663035373165313165633066376433303663383261383665336438623339313837
+32366266313765386339653634303136363765366263383032646134613932303634383139313332
+64376531393835643830656536636264643530306436393361356362396562356365643833363535
+31616430353236316262353863643863626532656139343339313033303066363564393461623130
+39366162343865663738336636373339656665353063393262666536316130373231343066386632
+33353130643731346232333837393037326563323763656438333662303763663364663730386136
+30623062623762386331326266623361336565626534623937393262363834663534633561613233
+35363634376535343461643230653635616335346332356538643133333037653233343563373232
+3638

http://git-wip-us.apache.org/repos/asf/airavata/blob/101a687a/dev-tools/ansible/pga-scigap-prod.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml
index 2299757..b831f8e 100644
--- a/dev-tools/ansible/pga-scigap-prod.yml
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -19,22 +19,24 @@
 #
 
 ---
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/brandeis"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/georgiastate"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/accord"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/brandeis"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/georgiastate"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu"
 - include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nanoconfinement"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nsg"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oiitandy"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oscer"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/phasta"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/scigap"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/seagrid"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/simvascular"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southdakota"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southernillinois"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/testdrive"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/ultrascan"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/utah"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nanoshape"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nsg"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oiitandy"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oscer"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/phasta"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/scigap"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/seagrid"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/simvascular"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southdakota"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southernillinois"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/testdrive"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/ultrascan"
+#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/utah"
 
 ...

http://git-wip-us.apache.org/repos/asf/airavata/blob/101a687a/thrift-interface-descriptions/data-models/user-tenant-group-models/tenant_profile_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/user-tenant-group-models/tenant_profile_model.thrift
b/thrift-interface-descriptions/data-models/user-tenant-group-models/tenant_profile_model.thrift
index ee946df..9649857 100644
--- a/thrift-interface-descriptions/data-models/user-tenant-group-models/tenant_profile_model.thrift
+++ b/thrift-interface-descriptions/data-models/user-tenant-group-models/tenant_profile_model.thrift
@@ -36,6 +36,19 @@ enum TenantApprovalStatus {
     DEPLOYED
 }
 
+struct TenantPreferences {
+    10: optional string tenantAdminFirstName,
+    11: optional string tenantAdminLastName,
+    12: optional string tenantAdminEmail,
+}
+
+struct TenantConfig {
+    16: optional string oauthClientId,
+    17: optional string oauthClientSecret,
+        13: optional string identityServerUserName,
+        14: optional string identityServerPasswordToken,
+}
+
 struct Tenant {
     1: required string tenantId,
     2: required TenantApprovalStatus tenantApprovalStatus,
@@ -46,14 +59,7 @@ struct Tenant {
     7: optional string tenantURL,
     8: optional string tenantPublicAbstract,
     9: optional string reviewProposalDescription,
-    10: optional string tenantAdminFirstName,
-    11: optional string tenantAdminLastName,
-    12: optional string tenantAdminEmail,
-    13: optional string identityServerUserName,
-    14: optional string identityServerPasswordToken,
     15: optional string declinedReason,
-    16: optional string oauthClientId,
-    17: optional string oauthClientSecret,
     18: optional i64 requestCreationTime,
     19: optional string requesterUsername
 }
\ No newline at end of file


Mime
View raw message