You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2019/06/02 15:51:58 UTC
[airavata] branch master updated: updating staging new with pga
inventories
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 28348fd updating staging new with pga inventories
28348fd is described below
commit 28348fd6fca5ef53badaf16ce5d89cf01090c5d3
Author: Suresh Marru <sm...@apache.org>
AuthorDate: Sun Jun 2 11:51:50 2019 -0400
updating staging new with pga inventories
---
.../scigap/stagingnew/pga_config/brandeis/vars.yml | 57 ----------------------
.../stagingnew/pga_config/brandeis/vault.yml | 18 -------
.../pga_config/{Kentucky => kentucky}/vars.yml | 0
.../pga_config/{Kentucky => kentucky}/vault.yml | 0
.../stagingnew/pga_config/{utah => oscer}/vars.yml | 28 +++++------
.../scigap/stagingnew/pga_config/oscer/vault.yml | 17 +++++++
.../scigap/stagingnew/pga_config/utah/vault.yml | 18 -------
dev-tools/ansible/pga-scigap-stagingnew.yml | 33 +++++++++++++
8 files changed, 64 insertions(+), 107 deletions(-)
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/brandeis/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/brandeis/vars.yml
deleted file mode 100644
index 1d2b909..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/brandeis/vars.yml
+++ /dev/null
@@ -1,57 +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/brandeis"
-vhost_servername: "sciencegateway.sci.brandeis.edu"
-vhost_ssl: False
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "adminuser"
-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: "Brandeis University Science Gateway"
- oauth_grant_type: "password"
-oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
-
-gateway_id: "brandeis"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/brandeis"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnenzHr90GmK9nGzUFVr2Xt0F8dVtqFTU/nSpEK22M0LcBWDJuX2lGw6tz/gU+j5SRAEu2HJnHb67DbvPG+DAEiCYf4sm94GBHljGjySlvDzC8uZGmOzRE3KCzDan5XnHHHQqXL+HJAOzkODVLhxEpN0AOq90Q+Og+vhJlmGJk6WIdjebBfVd0xcHp0nKFzB54F7f0cVubnt5XOE6rMZTb812RSHIIWVk1s5StVbpiDZMzwRJ4tBd1Oe+4DVSTJyn6SdEN18x2KoFeR6BrM8L5QiXhR8GhXj8MyoQLF5+m6q9Drp76n3qw2GMjGgmC8jdwFFOKRiIKM47u9sGrtljX"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgg@iu.edu', 'pontiggi@brandeis.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "base"
-#portal_theme_repo: ""
-portal_title: "Brandeis University Science Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/brandeis/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/brandeis/vault.yml
deleted file mode 100644
index 00bafc1..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/brandeis/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-31303634316634363761333939336137353638656138653735393033653134383136363639343633
-3064623061336533393637663664323132313965633336310a666537303338646530363830303166
-38303138373130306430323632393162373465643331333439353563346365383537336636346131
-3236316238373063380a373434346565386131616662646262636237303163386437323632333363
-33303536383839663838313961343665316531666532336666646433643735326231313430623836
-30366230376531333439636263386238386337653939663566633731346333643561666165393537
-66363561346631393936633038396137356563623236366135363464376434383137616534613733
-65336335633164653566343234323236343137626130316330653934323439616130623536356132
-30326139303631663231316262316364353466633463633865653864653764393165613063356537
-65616133656530326133353036656634626531363139376433306633613036313337666261396534
-30366333633936386236363261653332636565393539393538313534303430616361633831313363
-30316236633837643439376637313738356163363430356131346164656562653330646463323239
-62373463313230306261383834373930316363633066353838623639323531386630313438643339
-65343363666263636561343465633565383435333132326634306262326136306465653532393233
-38333566323832663632383836336236643463303333343863623635336338363133376630396464
-39643732303462633130393131303730323565653363623866323366623935373463366136393239
-3065
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/Kentucky/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/kentucky/vars.yml
similarity index 100%
rename from dev-tools/ansible/inventories/scigap/stagingnew/pga_config/Kentucky/vars.yml
rename to dev-tools/ansible/inventories/scigap/stagingnew/pga_config/kentucky/vars.yml
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/Kentucky/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/kentucky/vault.yml
similarity index 100%
rename from dev-tools/ansible/inventories/scigap/stagingnew/pga_config/Kentucky/vault.yml
rename to dev-tools/ansible/inventories/scigap/stagingnew/pga_config/kentucky/vault.yml
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/utah/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/oscer/vars.yml
similarity index 64%
rename from dev-tools/ansible/inventories/scigap/stagingnew/pga_config/utah/vars.yml
rename to dev-tools/ansible/inventories/scigap/stagingnew/pga_config/oscer/vars.yml
index 1f097df..01592c5 100644
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/utah/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/oscer/vars.yml
@@ -23,24 +23,24 @@ pga_repo: "https://github.com/apache/airavata-php-gateway.git"
git_branch: "master"
user: "pga"
group: "pga"
-doc_root_dir: "/var/www/portals/utah-university"
-vhost_servername: "cybergateway.chpc.utah.edu"
+doc_root_dir: "/var/www/portals/oscer"
+vhost_servername: "sciencegateway.oscer.ou.edu"
vhost_ssl: True
# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/cybergateway.chpc.utah.edu/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/cybergateway.chpc.utah.edu/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/cybergateway.chpc.utah.edu/privkey.pem"
+ssl_certificate_file: "/etc/letsencrypt/live/sciencegateway.oscer.ou.edu/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/sciencegateway.oscer.ou.edu/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/sciencegateway.oscer.ou.edu/privkey.pem"
## Keycloak related variables
tenant_domain: "{{ gateway_id }}"
-admin_username: "adminuser"
+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: "Utah Science Gateway"
+ - name: "OU Science Gateway"
oauth_grant_type: "password"
- name: "CILogon"
oauth_grant_type: "authorization_code"
@@ -48,18 +48,18 @@ auth_options:
logo: "/assets/cilogon-logo-24x24-b.png"
oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-gateway_id: "utah"
+gateway_id: "oscer"
# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/utah-university"
+experiment_data_dir: "{{ user_data_dir }}/oscer"
gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCiR1OU3jrSqoDxkieAQuB4YXnEllg+74h9nWKXSa7G6S8BDuSOVQl6YFdk1nCpJ9pGEoCziYa+fgTmQ98eXFEaXglRyu2Cq7HkPgKnBR5xtsx+Qslm/jBxO2C/kez7eGJH8F8bSOq6o4hUsPP8XUdzvf76o+wZ25RErqzQl1Go8E1sOi4fXkH4eR8cCsI093ZquuUgwIZjoqcj+bwCRoZWCqyOhXEzYqZmng4EvBm3VnPf77xdVxAZELDd7oKiTf4y1cEExIJyQJqwCJJjic9Utuf13lEROfnV2nELf1YdaLwWoFKJgc+bBaoxxxoo1hdKW7hFQDmgHCWASSIX0fx/"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZs3ErVmOoQ7GCRwsBJkh3BQVPaoeDw6cja67kXJPCBP7hQ1m9ld0h+PeIt/O8qwPgVN9kGf2fGeekJ9hTjAN8jk0xnU7og7F1RYg6+TqnugyfKZ22ZjfGf/tcc0Wd5BlokvMVJIsLCIv1N0OyxELrGi33y3U98egzn7r0j0uhtNZVN2AC4m1OpRJL7S9FRv9Z7CBXEs7x1j9ctyi3+Q8kBjWm7D78QPqCd2ODrHIDsPZpHm8CUOwHy9p7M+E2bbhkeGxExQhmBIFF75U4Lm3dzUzSmQGvUOppT+Nler8im7ArxS/8OJHEMOi4nW9J+BvtpDztQDAraJAX+VRNjaH5"
## Portal related variables
super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','Anita.Orendt@utah.edu']"
+admin_emails: "['smarru@iu.edu','sgg@iu.edu']"
portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "utah-sciencegateway-theme"
-portal_theme_repo: "https://github.com/SciGaP/utah-sciencegateway-theme.git"
-portal_title: "Utah Science Gateway"
+portal_theme: "oscer"
+portal_theme_repo: "https://github.com/SciGaP/ou-gateway-theme"
+portal_title: "OU Science Gateway"
...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/oscer/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/oscer/vault.yml
new file mode 100644
index 0000000..d96b100
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/oscer/vault.yml
@@ -0,0 +1,17 @@
+$ANSIBLE_VAULT;1.1;AES256
+39306166313062666130616632343032383866613163656166616534386339316330653235336637
+3631613163643364366133633339303362303261383938610a393732616163333539333665303533
+39366264656661373832643837383066323533346535316534373435613138633234626664623433
+3064333030653635380a346538303832313063633331393161386665343438613935666538333337
+35616333363430323334656461656335333961663634343138633237633265363534353064383363
+36646535623333316138613433336330336238643732666535623338343330393261366365633331
+34626363386135653564643530643430316439386331313333363333363064613764303134666630
+66356636613932643163393438396432616263373239346134633631393866386266333966623266
+65333666383630333265343130383963343839363461396638373363636461323337343765396334
+39356564393430333761653832313736666364336335636566663838643434326666326235616533
+36363033663932643833363466356635353136326531633833623463383132653464623331646236
+34313635313065323334323565363831303161623437623861346338343930326630353261306666
+32333438643864636234383033306363346330643935323962326133623066373433636362666534
+65333036643237623164363262373065633535323131386162386135343035353564346332313666
+36643066643639666631363161613038616238313938653139336464333463346530333130343837
+39633163336537373864
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/utah/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/utah/vault.yml
deleted file mode 100644
index 53202b9..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/utah/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-65613637666134636439323035313837633838666438643936636166643164346263613739323234
-3061643239626362666534366664613736353831376162610a303261353766333862393432613139
-66336330373036326632633935306362333130383331393736326134616231623465363161373565
-3934643930323833310a326266616534626135393934303261386432376634346633653933623963
-66303035393830656339376131363264633064356135393036636334653038356363323730636361
-32666636333966613432633439653935353632623035623263633766363763323239303037633236
-37306239346239323465386537663033393534363865306531326534396133356565396464326537
-34326261343133306435323063626330366464386461653539666666623430333164646533393832
-38323032386133626466626531653532363332373062383761313562346433353761373333616531
-30636566353636303730653062616162313130366561626537613036646662366665353436343735
-34643839323633616135333562326233303336333332613239643239636236333533643164353931
-39613833653864386331396539323563643630383261303465663333343466626639323362313332
-63323663663536373030623461303966396331643564353335633739353838393531346139663965
-61353339343162653736393062343430396635373765663035373464333463333237653134346634
-36313065306264616162366333663461333662396235373661616230623666353662343961636664
-62663966343564666631643161616463353836323566363131653838656665653436363963386166
-6363
diff --git a/dev-tools/ansible/pga-scigap-stagingnew.yml b/dev-tools/ansible/pga-scigap-stagingnew.yml
index 7c69ef5..037d9d7 100644
--- a/dev-tools/ansible/pga-scigap-stagingnew.yml
+++ b/dev-tools/ansible/pga-scigap-stagingnew.yml
@@ -19,7 +19,40 @@
#
---
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/ampgateway"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/csbglsu"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/ddstudio"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/distantreader"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/epwgateway"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/gatech"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/georgiastate"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/hubzero"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/interactwel"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugeosurvey"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/kentucky"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/mines"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nanoconfinement"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nanoshape"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/NCSAIndustry"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/newmexicostate"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nexttdb"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oscer"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/pfec-hydro"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/phasta"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/r-hpc"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/rutgersgemr"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/saverx"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/scigap"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/sdstate"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/seagrid"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/searchingSRA"
+- 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/uab"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/ultrascan"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/wvsu"
...