You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/05/10 16:30:23 UTC
[airavata] 02/02: Ansible: staging PGA instances inventory
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 5cf113dcad9f25e37604e1b7b67e43228f26e5a8
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Apr 23 17:15:09 2018 -0400
Ansible: staging PGA instances inventory
---
.../pga_config/{ultrascan => scigap}/vars.yml | 31 +++++++++++-----------
.../scigap/staging/pga_config/scigap/vault.yml | 18 +++++++++++++
.../pga_config/{ultrascan => seagrid}/vars.yml | 31 +++++++++++-----------
.../scigap/staging/pga_config/seagrid/vault.yml | 18 +++++++++++++
.../pga_config/{ultrascan => testdrive}/vars.yml | 31 +++++++++++-----------
.../scigap/staging/pga_config/testdrive/vault.yml | 18 +++++++++++++
.../scigap/staging/pga_config/ultrascan/vars.yml | 2 +-
dev-tools/ansible/pga-scigap-staging.yml | 3 +++
8 files changed, 105 insertions(+), 47 deletions(-)
diff --git a/dev-tools/ansible/inventories/scigap/staging/pga_config/ultrascan/vars.yml b/dev-tools/ansible/inventories/scigap/staging/pga_config/scigap/vars.yml
similarity index 64%
copy from dev-tools/ansible/inventories/scigap/staging/pga_config/ultrascan/vars.yml
copy to dev-tools/ansible/inventories/scigap/staging/pga_config/scigap/vars.yml
index 670f895..445fe59 100644
--- a/dev-tools/ansible/inventories/scigap/staging/pga_config/ultrascan/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/staging/pga_config/scigap/vars.yml
@@ -23,23 +23,26 @@ pga_repo: "https://github.com/apache/airavata-php-gateway.git"
git_branch: "master"
user: "pga"
group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "staging.ultrascan.scigap.org"
+doc_root_dir: "/var/www/portals/scigap"
+vhost_servername: "staging.scigap.org"
vhost_ssl: True
-ssl_certificate_file: "/etc/letsencrypt/live/staging.ultrascan.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/staging.ultrascan.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/staging.ultrascan.scigap.org/privkey.pem"
+ssl_certificate_file: "/etc/letsencrypt/live/staging.scigap.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/staging.scigap.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/staging.scigap.org/privkey.pem"
## Keycloak related variables
tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
+admin_username: "scigap_admin"
admin_password: "{{ vault_admin_password }}"
oauth_client_key: "{{ vault_oauth_client_key }}"
oauth_client_secret: "{{ vault_oauth_client_secret }}"
+# With Keycloak, we have to have static role names
+#user_role_name: "airavata-user"
+initial_role_name: "gateway-provider"
oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
auth_options:
- - name: "Ultrascan Gateway"
+ - name: "SciGaP"
oauth_grant_type: "password"
- name: "CILogon"
oauth_grant_type: "authorization_code"
@@ -47,20 +50,18 @@ auth_options:
logo: "/assets/cilogon-logo-24x24-b.png"
oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-gateway_id: "ultrascan"
+gateway_id: "scigap"
# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/ultrascan"
+experiment_data_dir: "{{ user_data_dir }}/scigap"
gateway_data_store_resource_id: "pga.staging.scigap.org_aa63ffa0-a99f-4885-8f4b-81e3c4c4d737"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqFFN7+93U5cELQCdZl+XiXmFxiSnQDXJaIdTKML3X/KU/0GkwUOBkrKVJaJEgpt+cSPLIg/qM4nVjt3iTfBIx9SPb6q8sHxSKnnNS/mfFvSOn/mxdNVgqNgTlqRy5axaeTn8wxa0afihZZLhU0MvUl0rrAcsR2gBU2zWeE9t+gj/HQ5D/dNmKQUJpexyY79RQi6mDwUPwHPXcLs+6YrJ68kpjmGQgGXUvCK/29neRvKpOXKds8E1kaa9nouxiQDCwAQKtqg8VAtfgMOX8gjur9DC1s45Ryjv+bLDuQ7MFMf5wEWg6QKSYoF94/JX3bC9nVjlL2wGX9HsWPDpWY2K5"
-data_sharing_enabled: "false"
## Portal related variables
super_admin_portal: "true"
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: "Dev Ultrascan SciGaP Dashboard"
+portal_theme: "scigap"
+portal_theme_repo: "https://github.com/SciGaP/scigap-portal-theme"
+portal_title: "SciGaP Admin Portal"
+#pga_google_analytics_id: "UA-111528347-4"
...
-
-
diff --git a/dev-tools/ansible/inventories/scigap/staging/pga_config/scigap/vault.yml b/dev-tools/ansible/inventories/scigap/staging/pga_config/scigap/vault.yml
new file mode 100644
index 0000000..fecaa71
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/staging/pga_config/scigap/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+37316430346432346631396330363763323036316131396463376232373137333631626664373435
+3432626264383530393434656264336631653433633637340a383161636134376230336233353232
+34366238613232393134663865626138613866623133616261373434653664313132323864336661
+6337356131643630360a343262646466393439313964353730653237386161346538383563396130
+65623231663331616634623463373231333633336633653138343730633839316530666633306266
+34653062386565666665616638633134616638363532613036616433626630326666636662383338
+30323237393763326364393265613937326565386330316165303366396466633866633438643166
+34613335623231303664363865393138343434333330393039393966323961383033653964343339
+38346635353465616139373037666636313266316637656534613063363130633833613733343430
+38306634363831633966356361366236666264346133323161626330623634326130343239623764
+38376336303663623261376133333833383633356436313134313837633730323034336161396564
+63393537306164393365343737393565613831303335323661623266393430663761626666623030
+36633531383665303835623031343133313665653437303465663334303135643264646436616566
+39383734396630356433313036333461633631616530373633396136643766616530653931363236
+37646237643030333634633739373932323064313536656566353135313939646138633636353737
+65323837346132363833333133323033646238393037653038646234316465333761336366323035
+3830
diff --git a/dev-tools/ansible/inventories/scigap/staging/pga_config/ultrascan/vars.yml b/dev-tools/ansible/inventories/scigap/staging/pga_config/seagrid/vars.yml
similarity index 65%
copy from dev-tools/ansible/inventories/scigap/staging/pga_config/ultrascan/vars.yml
copy to dev-tools/ansible/inventories/scigap/staging/pga_config/seagrid/vars.yml
index 670f895..9871f6b 100644
--- a/dev-tools/ansible/inventories/scigap/staging/pga_config/ultrascan/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/staging/pga_config/seagrid/vars.yml
@@ -24,11 +24,13 @@ git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "staging.ultrascan.scigap.org"
+vhost_servername: "staging.seagrid.org"
vhost_ssl: True
-ssl_certificate_file: "/etc/letsencrypt/live/staging.ultrascan.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/staging.ultrascan.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/staging.ultrascan.scigap.org/privkey.pem"
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/letsencrypt/live/staging.seagrid.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/staging.seagrid.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/staging.seagrid.org/privkey.pem"
+
## Keycloak related variables
tenant_domain: "{{ gateway_id }}"
@@ -39,7 +41,7 @@ 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 Gateway"
+ - name: "SEAGrid"
oauth_grant_type: "password"
- name: "CILogon"
oauth_grant_type: "authorization_code"
@@ -47,20 +49,19 @@ auth_options:
logo: "/assets/cilogon-logo-24x24-b.png"
oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-gateway_id: "ultrascan"
+gateway_id: "seagrid"
# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/ultrascan"
+experiment_data_dir: "{{ user_data_dir }}/seagrid"
gateway_data_store_resource_id: "pga.staging.scigap.org_aa63ffa0-a99f-4885-8f4b-81e3c4c4d737"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqFFN7+93U5cELQCdZl+XiXmFxiSnQDXJaIdTKML3X/KU/0GkwUOBkrKVJaJEgpt+cSPLIg/qM4nVjt3iTfBIx9SPb6q8sHxSKnnNS/mfFvSOn/mxdNVgqNgTlqRy5axaeTn8wxa0afihZZLhU0MvUl0rrAcsR2gBU2zWeE9t+gj/HQ5D/dNmKQUJpexyY79RQi6mDwUPwHPXcLs+6YrJ68kpjmGQgGXUvCK/29neRvKpOXKds8E1kaa9nouxiQDCwAQKtqg8VAtfgMOX8gjur9DC1s45Ryjv+bLDuQ7MFMf5wEWg6QKSYoF94/JX3bC9nVjlL2wGX9HsWPDpWY2K5"
-data_sharing_enabled: "false"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCApfdud3cJ7rx44M41gEKVgRfefk/Vd/7dIp9Xr9juX4jqmGuLoZR+hk287Hmbps6hZv23Av97XkCLldH0pueDekthcBDo4cRiQMDBp9NLz/9muqYVBl985psEbazYygagy/q/3ebi4CVEYVd4cHBee1V3GYyuJS2RklF0s/Otyf8x8auJSMniHGbTbVqtFlEOYuPdXlRBfH37k55N7+2iXKsIVvgn1MDweHEbQWJMx2LDCkLfJitreTiwcuST55w6N/n8WYZM2t+ie3BJEr6tcGAVIuyxj7CbMYMziM/hM5J+oQGPY/IBtiNZoxiZ0DeAC9SiEvE9fbTEW2iRWnQL"
## Portal related variables
-super_admin_portal: "true"
-admin_emails: "['sgrc-iu-group@iu.edu']"
+super_admin_portal: "false"
+admin_emails: "['pamidigs@iu.edu', 'sgrc-iu-group@iu.edu']"
portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "base"
-portal_title: "Dev Ultrascan SciGaP Dashboard"
+portal_theme: "seagrid"
+portal_theme_repo: "https://github.com/SciGaP/seagrid-website-theme.git"
+portal_title: "SEAGrid Portal"
+#pga_google_analytics_id: "UA-110457476-1"
...
-
-
diff --git a/dev-tools/ansible/inventories/scigap/staging/pga_config/seagrid/vault.yml b/dev-tools/ansible/inventories/scigap/staging/pga_config/seagrid/vault.yml
new file mode 100644
index 0000000..af2673b
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/staging/pga_config/seagrid/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+63383837396262336563656433376638646633666363643538636335626662313365656562356661
+3934393534323666643862646566323533666530616632350a656438373832313334386630643131
+30333932393737643331636466313839353734343264363531383065323464313638653732643666
+6665386237633864640a366665316633396634383261323535623465363938386337663261323232
+64373062353532313034313361313632646639643630616566396634393637323231376463306631
+34343365376665353363303233313264353962636331346164306465316332343731363135363234
+31343331333861363239343532303561333861633965373231316465643934633438313938396162
+33356239623839323365663236626531653864353538623132383835396230323636623832636432
+64646165356234333234613039613937373737633165616438623930646263313762316335636435
+38663230336562343161633035386634373837653866363662316631336237383231326238336438
+30363432383363343465646537383864323063303735343534373734343132633361656533383835
+66623436373463326564316163373938366538323639363535313835366136393739376634626462
+36646632363530346537336463653134653030383938616235326461316432383966323064663937
+35643534343930313463653939386138363139313834616638326338663661636666356164396164
+38643736323064363539383566303731363133653362393762373138303832363935363964393336
+31646136633032353832323338376665353837343039353061383435323264356339633162353238
+3364
diff --git a/dev-tools/ansible/inventories/scigap/staging/pga_config/ultrascan/vars.yml b/dev-tools/ansible/inventories/scigap/staging/pga_config/testdrive/vars.yml
similarity index 65%
copy from dev-tools/ansible/inventories/scigap/staging/pga_config/ultrascan/vars.yml
copy to dev-tools/ansible/inventories/scigap/staging/pga_config/testdrive/vars.yml
index 670f895..bbddb99 100644
--- a/dev-tools/ansible/inventories/scigap/staging/pga_config/ultrascan/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/staging/pga_config/testdrive/vars.yml
@@ -23,23 +23,23 @@ pga_repo: "https://github.com/apache/airavata-php-gateway.git"
git_branch: "master"
user: "pga"
group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "staging.ultrascan.scigap.org"
+doc_root_dir: "/var/www/portals/testdrive"
+vhost_servername: "staging.testdrive.airavata.org"
vhost_ssl: True
-ssl_certificate_file: "/etc/letsencrypt/live/staging.ultrascan.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/staging.ultrascan.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/staging.ultrascan.scigap.org/privkey.pem"
+ssl_certificate_file: "/etc/letsencrypt/live/staging.testdrive.airavata.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/staging.testdrive.airavata.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/staging.testdrive.airavata.org/privkey.pem"
## Keycloak related variables
tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
+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: "Ultrascan Gateway"
+ - name: "Test Drive"
oauth_grant_type: "password"
- name: "CILogon"
oauth_grant_type: "authorization_code"
@@ -47,20 +47,19 @@ auth_options:
logo: "/assets/cilogon-logo-24x24-b.png"
oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-gateway_id: "ultrascan"
+gateway_id: "default"
# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/ultrascan"
+experiment_data_dir: "{{ user_data_dir }}/testdrive"
gateway_data_store_resource_id: "pga.staging.scigap.org_aa63ffa0-a99f-4885-8f4b-81e3c4c4d737"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqFFN7+93U5cELQCdZl+XiXmFxiSnQDXJaIdTKML3X/KU/0GkwUOBkrKVJaJEgpt+cSPLIg/qM4nVjt3iTfBIx9SPb6q8sHxSKnnNS/mfFvSOn/mxdNVgqNgTlqRy5axaeTn8wxa0afihZZLhU0MvUl0rrAcsR2gBU2zWeE9t+gj/HQ5D/dNmKQUJpexyY79RQi6mDwUPwHPXcLs+6YrJ68kpjmGQgGXUvCK/29neRvKpOXKds8E1kaa9nouxiQDCwAQKtqg8VAtfgMOX8gjur9DC1s45Ryjv+bLDuQ7MFMf5wEWg6QKSYoF94/JX3bC9nVjlL2wGX9HsWPDpWY2K5"
-data_sharing_enabled: "false"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUF51b2cYYqqadLHL9M/oPY0ZHZlWbdOdaIgjpzIzMnO7M9hKrHVY2pqyLPvqCLzaunxITPWsTqw0E8hwub4ttGLAx/O4kIf+BgyZK7iuwXWhI7u85/o58IfrD4B+jVCYKRNayuLR+lJWsiOeS6HSlunpTKTEhFGeOHn2UzdbLfgWYQ3VUFDtKN1oDPDT78ml5c2RCibJ21jltpevVfEtCUctERpTfniWSuQZggP1qiLNa1+PfiJ3mGsEzJFDntQvQetdinaAbEaT7+sctS8nBNjapkmYMf6tBl3S0bLttYPH51f8lUQAFaAzrestO1JpJNnIeY01/S3MWIlAWASnn"
## 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: "Dev Ultrascan SciGaP Dashboard"
+#portal_theme: "base"
+#portal_theme_repo: ""
+portal_title: "Airavata Test Drive"
+#pga_google_analytics_id: "UA-111528347-2"
...
-
-
diff --git a/dev-tools/ansible/inventories/scigap/staging/pga_config/testdrive/vault.yml b/dev-tools/ansible/inventories/scigap/staging/pga_config/testdrive/vault.yml
new file mode 100644
index 0000000..95c6b7b
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/staging/pga_config/testdrive/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+62316432336565373739373638656637383161323536666436333537613536316266663164316635
+3132356235643331643331633662356338396533653764390a313730663662626436663538313464
+66373335636162303330353861373638396661663132643261363939386566613439333762613661
+6238343362343065340a396661346465366335366431613565346339376133636138613338353334
+31643162383939353364363465353630393134656530646535376230303233333031636639333033
+63373166363130653038633432333335623131373637363635393662313235313732323036303965
+32306331646635656661313330646232363931623864393036336634363632303634653639326238
+65663739663439653333333532303862333932343663303465623062383432333031353730653366
+66373135383561386533353331643238666563633337353565326139306139353661326233663433
+39613466393030356563396331353639633835663636666137623561623237346666643230663832
+38663965623638343161386238386133373531373238623263613531376137393531613031643333
+37376462316562313632616338353163373839616237323734356638316535333638383164373065
+37343234393532353964313039363038663937323730623232366230343034656366333933366162
+33663637343837643161616162633964623136376161633661633533616533396139623033666533
+31363064363861623338323831363864303464393666363432383935356461656133653165333531
+64313835316362363633633865623265613431643133333230376333323030626334623235343432
+3163
diff --git a/dev-tools/ansible/inventories/scigap/staging/pga_config/ultrascan/vars.yml b/dev-tools/ansible/inventories/scigap/staging/pga_config/ultrascan/vars.yml
index 670f895..31b52b2 100644
--- a/dev-tools/ansible/inventories/scigap/staging/pga_config/ultrascan/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/staging/pga_config/ultrascan/vars.yml
@@ -55,7 +55,7 @@ gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqFFN7
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 }}"
diff --git a/dev-tools/ansible/pga-scigap-staging.yml b/dev-tools/ansible/pga-scigap-staging.yml
index c9cceba..d8013e3 100644
--- a/dev-tools/ansible/pga-scigap-staging.yml
+++ b/dev-tools/ansible/pga-scigap-staging.yml
@@ -19,5 +19,8 @@
#
---
+- 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"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/ultrascan"
...
--
To stop receiving notification emails like this one, please contact
machristie@apache.org.