airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [1/2] airavata git commit: PGA configs for dev.seagrid.org, dev.scigap.org
Date Mon, 19 Jun 2017 13:16:09 GMT
Repository: airavata
Updated Branches:
  refs/heads/develop 555eb6bcc -> b24d60f34


PGA configs for dev.seagrid.org, dev.scigap.org


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

Branch: refs/heads/develop
Commit: 34242484bd9c0caf0129753bfd0ebe8d63e4ec22
Parents: 555eb6b
Author: Marcus Christie <machristie@apache.org>
Authored: Fri Jun 16 15:48:57 2017 -0400
Committer: Marcus Christie <machristie@apache.org>
Committed: Fri Jun 16 16:53:44 2017 -0400

----------------------------------------------------------------------
 .../scigap/develop/group_vars/all/vars.yml      |  1 +
 .../scigap/develop/pga_config/scigap/vars.yml   | 27 +++++-----
 .../scigap/develop/pga_config/scigap/vault.yml  | 34 ++++++------
 .../scigap/develop/pga_config/seagrid/vars.yml  | 17 +++---
 .../scigap/develop/pga_config/seagrid/vault.yml | 34 ++++++------
 .../develop/pga_config/testdrive/vars.yml       | 56 --------------------
 .../develop/pga_config/testdrive/vault.yml      | 18 -------
 dev-tools/ansible/pga-scigap-dev.yml            |  3 +-
 8 files changed, 60 insertions(+), 130 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/34242484/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 01a2fe6..a650286 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
@@ -118,6 +118,7 @@ real_user_data_dir: "/data/gateway-user-data"
 airavata_server: "tls://{{ groups['api-orch'][0] }}"
 airavata_port: "9930"
 auth_verify_peer: "true"
+oauth_service_url: "{{ iam_server_url }}"
 
 # Sharing Registry related variables
 sharing_registry_host: "{{ groups['api-orch'][0] }}"

http://git-wip-us.apache.org/repos/asf/airavata/blob/34242484/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vars.yml b/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vars.yml
index 8cb7375..099a9bd 100644
--- a/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vars.yml
@@ -20,37 +20,38 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
+git_branch: "develop"
 user: "pga"
 group: "pga"
-doc_root_dir: "/var/www/portals/scigap"
-vhost_servername: "scigap.org"
+doc_root_dir: "/var/www/portals/dev-scigap"
+vhost_servername: "dev.scigap.org"
 vhost_ssl: True
 # TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/pki/tls/certs/scigap_org_cert.cer"
-ssl_certificate_chain_file: "/etc/pki/tls/certs/scigap_org_interm.cer"
-ssl_certificate_key_file: "/etc/pki/tls/private/scigap.key"
+ssl_certificate_file: "/etc/pki/tls/certs/dev_scigap_org_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/dev_scigap_org_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/dev-scigap.key"
 
-## 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://iamdev.scigap.org/auth/realms/scigap/.well-known/openid-configuration"
 user_role_name: "airavata-user"
 
 gateway_id: "scigap"
 # relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/scigap"
-# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
+experiment_data_dir: "{{ user_data_dir }}/dev-scigap"
+# NOTE: scigap portal doesn't make use of the gateway data store, only used to manage other
gateways
+gateway_data_store_resource_id: ""
 
 ## Portal related variables
 super_admin_portal: "true"
 admin_emails: "['sgg@iu.edu','eroma.abeysinghe@gmail.com','supun.nakandala@gmail.com']"
 portal_email_username: "pga.airavata@gmail.com"
 portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "scigap"
-portal_theme_repo: "https://github.com/SciGaP/scigap-portal-theme"
+portal_theme: "base"
 portal_title: "SciGaP Admin Portal"
 ...

http://git-wip-us.apache.org/repos/asf/airavata/blob/34242484/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vault.yml b/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vault.yml
index a30ba69..8b3b274 100644
--- a/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/pga_config/scigap/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
+66643536656361636339616663393332663862623736333263353739396330333833666336663564
+6332613062363366333265376537656436306438343164380a383362623064383237396433353139
+36323038313235323962613864376562386165353365343430306635383131663636616131323962
+6237356432313434660a346364303238343938376437663939363361336666323234366266666161
+65396434313232323463363965623130333637323134653234383962313566323161626535613533
+32303632633137306436356265386533643634663561366131646234343734656161373463653432
+30336132396634343339323466663132313666343631346430643131363939373564383766356266
+36383336373361333139323038623638633130616330313461656566663164353166373466343232
+37346665663566646562356363376638336330353838646634373633646133653163656138373336
+35346434316466616535393332373839636161363038643937616533306433656335373134313036
+63346462623637643461303364353637623166633235373835306338333435656333633731376461
+35643330323064366137383530346234383266363531346265616530306363383463623234623137
+34343637353430373936393766396135383461323832353165393839653236653135613266376236
+30643438316431373566653639353931323030343030303762376431306231336336633131613963
+65656361363961316338373135333864363766616466376539613061663364353937613664393462
+62323562666634653936323837363738316330353163393632376463336165336439306530363139
+3465

http://git-wip-us.apache.org/repos/asf/airavata/blob/34242484/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vars.yml
index 122d6e0..9853ac0 100644
--- a/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vars.yml
@@ -23,13 +23,13 @@ pga_repo: "https://github.com/apache/airavata-php-gateway.git"
 git_branch: "develop"
 user: "pga"
 group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
+doc_root_dir: "/var/www/portals/dev-seagrid"
 vhost_servername: "dev.seagrid.org"
 vhost_ssl: True
 # TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/pki/tls/certs/seagrid_org_cert.cer"
-ssl_certificate_chain_file: "/etc/pki/tls/certs/seagrid_org_interm.cer"
-ssl_certificate_key_file: "/etc/pki/tls/private/portal.seagrid.key"
+ssl_certificate_file: "/etc/pki/tls/certs/dev_seagrid_org_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/dev_seagrid_org_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/dev-seagrid.key"
 
 ## Keycloak related variables
 tenant_domain: "seagrid"
@@ -37,16 +37,19 @@ admin_username: "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://iamdev.scigap.org/auth/realms/seagrid/.well-known/openid-configuration"
 
 gateway_id: "seagrid"
 # relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/seagrid"
+experiment_data_dir: "{{ user_data_dir }}/dev-seagrid"
+# TODO: Fix the data store resource id
 gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCApfdud3cJ7rx44M41gEKVgRfefk/Vd/7dIp9Xr9juX4jqmGuLoZR+hk287Hmbps6hZv23Av97XkCLldH0pueDekthcBDo4cRiQMDBp9NLz/9muqYVBl985psEbazYygagy/q/3ebi4CVEYVd4cHBee1V3GYyuJS2RklF0s/Otyf8x8auJSMniHGbTbVqtFlEOYuPdXlRBfH37k55N7+2iXKsIVvgn1MDweHEbQWJMx2LDCkLfJitreTiwcuST55w6N/n8WYZM2t+ie3BJEr6tcGAVIuyxj7CbMYMziM/hM5J+oQGPY/IBtiNZoxiZ0DeAC9SiEvE9fbTEW2iRWnQL"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWgLve4J9WCohF/4UnbBZsh/nRkP1aM9FmA1FjKwK2gQAnKwhU+NrbsjW38h2Hi+8s9N2oZ9cCJHrvDi2U0cMxz4exIUBcVoRhw37ThlREHADeKR1FbKw0QLhTyfJb0K+1/8GWRluiFx0vHPptJe0KTqu+RJY0NSe+d/BEuGyCZ1hR+SKNuTgcb05Ia6opbSN5D68N9biseEux60d69ARQxLw+VN3Kr/UaBNpGIAfKLlLSUQlTyPA6G6UKCcJZv+/ye10oa0SK0qtrxMpL+4VJcVx+d56U7CUFWKEgPAaQrX1qdGUNDA7HKmD+EBtzw6DJqNJ0Cue/XuPe/RT62tpf"
 
 ## Portal related variables
 super_admin_portal: "false"
-admin_emails: "['pamidigs@iu.edu', 'sgg@iu.edu']"
+admin_emails: "['sgg@iu.edu','pamidigs@iu.edu', 'eroma.abeysinghe@gmail.com']"
 portal_email_username: "pga.airavata@gmail.com"
 portal_email_password: "{{ vault_portal_email_password }}"
 portal_theme: "seagrid"

http://git-wip-us.apache.org/repos/asf/airavata/blob/34242484/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vault.yml b/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vault.yml
index b253227..4fa5716 100644
--- a/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/pga_config/seagrid/vault.yml
@@ -1,18 +1,18 @@
 $ANSIBLE_VAULT;1.1;AES256
-66333335376433663761356636313739303836383431366135633735663262366262663737613936
-6238613036636365653530353538373031623562373335300a316462306231653531613330303030
-61383138343832616162353239303331663164326635336566663666316232366562616633316139
-6365666632373662340a666238353135396239373062383331386137353134336539386636623237
-37326237326233303437386666646138666530663766376238366263653730353938363064663336
-62336662643831653833633835653666363134303830633834336162383265666131303434346466
-32323937663766323632396631616264326232613361333834303031636239333435343563396366
-35643766376466613535383938623038653634303035323065363031303032303835343866643330
-37303462333839313265353063613937623431336635623839386137353433396136623162333233
-62633536616437376366663566393430626533323232383733353761643738376366316631353562
-35366133373866393737653665326566353963643138633630393838643363633562623430373132
-62383531356430646633323933633130623935653139363566326232653965333764363238333137
-30663863363566353035393437316135303265643165353034326664656336623930613632376237
-62393231336539656636636530643863323834363130636238323732373738316265306665643962
-62333437313064623566386438636136613461373332343462613733623736666338333064346661
-62643035636435663135613437383036663034363536646634633966666633643033303634633639
-63396139343037353433613936333962366130333336333231353836353161636365
+35363834376232323532383937363965643066346662646162623433363134396438383566373532
+3166626337666161386532363635386338366439643935310a316430613738343939333932386333
+65313532396532323834346437643366376465393637326137333838366536373438643434653663
+3735333530316164340a626331396161636332663765653465303335306162653232313863303762
+39666330626562646533656639386639653635623735333432386431323532623334313964393732
+65383465353438366438383938393165353235383438636265653731616235613839363566396635
+38653763353363316233373932313638376231366531306462666436353437376139303939343433
+65613532666230366239626132323661646137333031336230343862306534613564623161303066
+62376132666365303632626639643835623465643564393033623866383836323932383533613861
+62363336393361363266323636356164383962343939336432396538373662396264633361353162
+66663935316236316533633134393136356361373936306438333932666662653263613662636166
+62326139646537326334376464303466366563636465343362656131643735626633393835636265
+63343833396434366637626539653536343539383763393234333466623031393634343930393836
+31636136386135336430303035376533343038336662383139653831666230663232616533653461
+61363665633937666162303638366435613838356665613361313730383734383163666537386330
+38386238316366306466346432663139333038353339376336346166393639336137313231356333
+3336

http://git-wip-us.apache.org/repos/asf/airavata/blob/34242484/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vars.yml b/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vars.yml
deleted file mode 100644
index 0e07e38..0000000
--- a/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vars.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#
-# 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: "master"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/testdrive"
-vhost_servername: "testdrive.airavata.org"
-vhost_serveralias: "www.testdrive.airavata.org"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/pki/tls/certs/testdrive_airavata_org_cert.cer"
-ssl_certificate_chain_file: "/etc/pki/tls/certs/testdrive_airavata_org_interm.cer"
-ssl_certificate_key_file: "/etc/pki/tls/private/testdrive-airavata.key"
-
-## WSO2 IS related variables
-tenant_domain: "prod.testdrive"
-admin_username: "tdaadmin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-gateway_id: "default"
-# 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','eroma.abeysinghe@gmail.com','supun.nakandala@gmail.com']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "base"
-#portal_theme_repo: ""
-portal_title: "Airavata Test Drive"
-...

http://git-wip-us.apache.org/repos/asf/airavata/blob/34242484/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vault.yml b/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vault.yml
deleted file mode 100644
index 2719a75..0000000
--- a/dev-tools/ansible/inventories/scigap/develop/pga_config/testdrive/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-62343936613436343730626461303331313361373265653231623265646366343037303261643162
-3730386162363861626462626432373932363365323233610a643637633565333538633462383530
-61333833323534356430343461363531663035386637623836366361653430323861333639653762
-6239626461646433380a376139303561346661316131376366623538643433326335363032653966
-63393732653961666637343966623839386564643339653665623433613132363832363061356665
-63346637373235623332613561303162356363323937303630623036386636393465346662336365
-63386238306534613136643466323564626336386165616137653133316532613465626365393961
-34373466613439346534366263633261643936323334316636376538613233663333646636383838
-66333437316165656262386337326131396432616137326631643532613438366633396337633065
-62363833616239626666613062623730326633616532336662653234393863373962396564353662
-66366461343066366161366633666562613031613036363237636333343734393730383332363534
-62306435633163303864636639613465633936636462333636633361613431396265626333373761
-32346234383639363163326435356330633062383162353666303931376133393431356336663665
-34303265386334623332303336633662323563643661623566353734303362326661643062613637
-31666239313065316633613162646631636534356233323533663666613537303263646261643363
-32303539633332386566623435353732396532396537643736356334383565316433633261333630
-36336263323934643764323263393362373531643165373435326539623266383936

http://git-wip-us.apache.org/repos/asf/airavata/blob/34242484/dev-tools/ansible/pga-scigap-dev.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-dev.yml b/dev-tools/ansible/pga-scigap-dev.yml
index 04e2ef0..06409dd 100644
--- a/dev-tools/ansible/pga-scigap-dev.yml
+++ b/dev-tools/ansible/pga-scigap-dev.yml
@@ -19,8 +19,7 @@
 #
 
 ---
-#- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/scigap"
+- 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/testdrive"
 
 ...


Mime
View raw message