This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch param-sweep
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/param-sweep by this push:
new 8cf2096 Adding inventory for smaltr deployment
8cf2096 is described below
commit 8cf2096166ea985df6534464295c20588de5d6e6
Author: Dimuthu Wannipurage <[email protected]>
AuthorDate: Thu Jun 11 12:33:13 2020 -0400
Adding inventory for smaltr deployment
---
dev-tools/ansible/database.yml | 2 +-
.../scigap/smaltr-testing/files/airavata.jks | Bin 0 -> 2623 bytes
.../scigap/smaltr-testing/files/airavata_sym.jks | 30 ++++
.../smaltr-testing/files/client_truststore.jks | Bin 0 -> 6618 bytes
.../scigap/smaltr-testing/files/keycloak.jks | 143 ++++++++++++++++
.../scigap/smaltr-testing/group_vars/all/vars.yml | 180 +++++++++++++++++++++
.../scigap/smaltr-testing/group_vars/all/vault.yml | 36 +++++
.../smaltr-testing/group_vars/django/vars.yml} | 27 ++--
.../inventories/scigap/smaltr-testing/hosts | 23 +++
.../smaltr-testing/pga_config/scigap/vars.yml | 67 ++++++++
.../smaltr-testing/pga_config/scigap/vault.yml | 18 +++
.../{database.yml => pga-scigap-smaltr.yml} | 14 +-
dev-tools/ansible/roles/common/defaults/main.yml | 4 +-
.../src/main/resources/expcatalog-mysql.sql | 6 +-
14 files changed, 517 insertions(+), 33 deletions(-)
diff --git a/dev-tools/ansible/database.yml b/dev-tools/ansible/database.yml
index 1ecc726..834c3d9 100644
--- a/dev-tools/ansible/database.yml
+++ b/dev-tools/ansible/database.yml
@@ -27,7 +27,7 @@
- hosts: database
tags: mysql , airavata
roles:
- - env_setup
+ # - env_setup
- role: database
become: yes
become_user: "{{user}}"
diff --git
a/dev-tools/ansible/inventories/scigap/smaltr-testing/files/airavata.jks
b/dev-tools/ansible/inventories/scigap/smaltr-testing/files/airavata.jks
new file mode 100644
index 0000000..93fa433
Binary files /dev/null and
b/dev-tools/ansible/inventories/scigap/smaltr-testing/files/airavata.jks differ
diff --git
a/dev-tools/ansible/inventories/scigap/smaltr-testing/files/airavata_sym.jks
b/dev-tools/ansible/inventories/scigap/smaltr-testing/files/airavata_sym.jks
new file mode 100644
index 0000000..13ccf1b
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/smaltr-testing/files/airavata_sym.jks
@@ -0,0 +1,30 @@
+$ANSIBLE_VAULT;1.1;AES256
+66393935613465373265366662383133353632633262353839623837636364373339336564636265
+3862663231313565313064643833646530636361333866610a636266666561306263343632663734
+33306432363830323132653038326139323464393065313631373936346162386161626461396530
+3061376439346264310a346630616535326435626235393564643062326665313239373839336331
+38316134613764373336333338323263356563396638303932656562336538333137643131373366
+35653334383566313262336261623339626532333634363531313534353762356534643961646338
+34633938333436333135643736663437373532633061366464343632643366343337366262386465
+33373333333033303262316566346565613731633361333438363063616165333231323635646333
+34303463656431663932326464356332353235336238653462663463373332656231373562626664
+65346131663064376232643435653264383465323761373063366162663236323935373139386138
+39623734643064623635376261646465383663613238623531613066306464326662346532346365
+63623064383436303634393639316638366136653563663930303130643531373166613133653338
+36636433626539366661656164613032653931356561336336343561323962336462383164393463
+65353265363535616136306136353064346561666439663532626234363763653535663061386232
+61663566343361666634346134623538366664396236346365336431383937653761643235613661
+32373439656332306536623336343763386364363265306138356138616464656662363434636531
+30646163333462636236336532383964643234616131663465666663633333343366376134666263
+63353161336366613065303434656537396237643938376233333431663232356630373038333835
+37306162623439323062626532656633646138386131643037323566643264653432633735333362
+65613564393232393433646334376639356564376661663430353630626534336566663061303632
+64633235333463626435323134636333353536393936663539663539336233363934333931323961
+63313739333733613465376334336239306633636136383831396533326530616133373366653531
+33356137656636323037303430623065393930633731346634346161633334313362613136313138
+36633835353665626462363031653161646530366339363732373865343136356637326631386437
+30383235306538303261613262376634303164313862366330393463346261363866346336666136
+37333566396436383534633330316465306461383537616661343265663731363561323137303164
+36336532333233343463633064346162646562613332646331343931363838333739636335376331
+66626436313938346362303932336339636434666665373862306462646162393066303338383265
+64363138663564386332383032366265666565643633393236663830313936343637
diff --git
a/dev-tools/ansible/inventories/scigap/smaltr-testing/files/client_truststore.jks
b/dev-tools/ansible/inventories/scigap/smaltr-testing/files/client_truststore.jks
new file mode 100644
index 0000000..f45fc52
Binary files /dev/null and
b/dev-tools/ansible/inventories/scigap/smaltr-testing/files/client_truststore.jks
differ
diff --git
a/dev-tools/ansible/inventories/scigap/smaltr-testing/files/keycloak.jks
b/dev-tools/ansible/inventories/scigap/smaltr-testing/files/keycloak.jks
new file mode 100644
index 0000000..c896d03
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/smaltr-testing/files/keycloak.jks
@@ -0,0 +1,143 @@
+$ANSIBLE_VAULT;1.1;AES256
+66353964396536666532306233383464343935653932393865616364373334333365346439633266
+6634663634323434643464633734316137336562653463340a383030363463386465303639626439
+36303865353236336132663634626462313266626362613536643532613239346438333834383733
+3339653664613332370a653838373036626231613532653233633732646562353762303530653039
+65613364353436323463616239303538376462643666373063326437313935353839363262333735
+34303838356532636566646530353262613864313236373738626334306563346266393566316163
+62666238633236633231626262333963363366343138646432356366326538353966653630643737
+64306235383835343236643962343164653531616333373933633139326465336331666634373839
+63373361313232383661366264336261383635313138323362636664643065303661666138366332
+39343164346434373137663266636538333661643836633531333363616138313165363833623966
+63613462343332393962363436366637353065303435333236666661356436366136643338326664
+66313664616535626438363230313765663431333266636466363233383735313534356635663230
+64656638303730613337616137363930373631616137393438623032326236613037663232336233
+61646565656630333864666364616231653465653264633838363832623232666366666235623832
+36343139363466633132396461333335393862383939363834366434333561393734666465366464
+30626135393766366665613336623564643832343130396365643838363863383134363932633165
+62393730323636343862396635306463666230363231393633363631333732653935333939336435
+30643331383165626666353937623039323434333631356631336435646635656461616663393763
+61303634626632356630343039333438363034663566313230396363353963313766393536646131
+34336561366662366232383463376664383565346135386663363363373432316238323162333063
+32656563383838333338343630376536643764326639613530633866663636646433323830623739
+38326130313337306132373038393637626461396637383031363732646437643036616232323765
+30626662663331326233336163393961666262366230656532323562383761323265343863346562
+30353431343531346535383932663035333135633035643064383132386431346530343562393765
+38366231613566623965363534303762636235613561343963323834356431616537303537306636
+38396463666562306131376138396633373765643233656532396630333232393934396262386561
+62383034326665303436613834366331353562613730633965356339316430363061336237626235
+38656336626330343962343035313237353261366230663738353161353366343561333864333832
+64333131666332636335666530323933626138643637363132353132653061373238636265363734
+37363039336661353966366461353138363130333763313761653234386666366661663734396161
+35333137613262376662396462383637333436393932306134666232303061316332643937653236
+30316336303663303332643431316539326432343864356133633737656331366331663833613230
+65383763316565313962323564616536393265396539313034636635343731396536643733663164
+66316161623162633664333931613233333432303335363461363535643365323133346334626537
+38633039356462333031313239323064303038316564326364306332376432376163356639313732
+66386136626436303061396232363433353533643562633530633430323534353365316531316336
+31653164303166616366633135323661306563376363373839343663643033343736396364646334
+62353939346166333461666131643636663538336531346561316437666531386166633536646435
+33633533326537356530616235306164666231333936386135316362306431393334396466383039
+62653763393165333862383165633030666635323666653930396635373238396636316136633864
+39666237313465313537366330346663316265343638626531343665663062373434323130366366
+61313761363432613464633333383762333137616334343564366638333037326536323035343833
+61633235333238313562393431356538346334613834366434643433663436616339396663326335
+65613134653335373139393437353666623037643939383939373238366235366332383731356132
+30313036656435353663353339343164303536663736376336343461636665303038306137643765
+36343333313364336431353332613665636265336636346536396166323732623630386461636638
+32613139316430663132643138346261353031326639656464303536643736343165336631383739
+30643961643233633238333632313933303434663530666331356666653062663036613862663739
+39343439626533376232626534316333316464303064393338616362626166663332613631363464
+62633634643462346463303961383865343466396336323465663036666534623366633462306330
+63386332666538313265303666343337373864326638313131393365653964316632643536613363
+35353038383565623430376665646264313033323761356138646366623464643232353231323061
+33613936626365303639663361646631653231643938616537653163363439333131373161366639
+35316464383436396536343966383630333539306637353135643663636364303630646133636131
+34383036633539663064656532313730656630666436373638333765343465383865616139623133
+62633764386463346239333536323835613963316661363732663538306335313439386430643032
+62646338633730663438343931333732373966623838313430636137366230353736323034653537
+34646537663263383062643761363738396163386265386565353335616435323736363466353164
+39666365376137326637363661326437383337393234336266393437333063663366383862666162
+65306235626436333237353466303934653436613639303236373932626563356662393463323032
+32373963323964333030663362336435353063366638363830393866393563646663343165353161
+31303832613839613930623732656232306438336463393233326339653636626266666238353462
+39623361376663363833323330333862383237653733636332363934613965633035393337633539
+62613064393338333062333764646332633461626462663863626330636231373366656235323266
+61646636633234656532643235643363626235643938633235633234643834396639353864336365
+36333231626531613538333330323230626264393466373234396634373263323238386465353339
+65626637306537653261623336356363343136363836616635306664303866346262626366386138
+30633539376438653938626264383631353736353133653134306534636632613834366534303439
+35626265663564316266636337646266316430353065303331343462666537633135363363363563
+33613538323564613834363432633261633532353931363730626263396461303034346433666332
+32623439333931363333363533353539306234313063353865333362623839306438633565373730
+35616233313235386338356464336362366166663663343339383937393564313338386566666631
+63373532663363646438363637346139373534363935313833333465363634363861346435366265
+38303634623037663665396337383339366166373164633764383433633663636663663862353135
+66326561663838623865633839616139336633633530626538643661366163376530646233336233
+36333263633036616531633666666539343436336236353431396435336164663363366533356633
+32303730653236656264343365303763646236313461336139353737383233343666636334346565
+38653030616339303763313661333139666535363730656263616663373362353637656434313265
+32613839613336333837636430626166393162653032323130303965663237633962373931346161
+38373364383462376162336335626162346334333564626661643338653637316339613562613137
+62316130306633636431643036376236353438616163383139613630383065346138363530633964
+33326165363431316334616237326635306163633661316161656362373263393561666335623661
+37333839656131353162323731323438343238383435306633373932353135336139643565363939
+32363261633737376138386133366135323563316462616162666137353433333862356234613562
+61306337363736663332623039306136383064396139326433333036386337363031343638333238
+30613862316538666362353634376364656331323965393466386263356166383138346661343764
+64363331633061616233303562373133363164373165613632653235633261353433373932323039
+30646363653938623566336161613166616134353131623564653432646265663532366634393235
+61393335356361333239393634356130636237646437356662366666336164303463333330323930
+32383733663563306336383264633137353138663234643136376232383462663231313634336631
+66636363343230636237303565393363326230376235353735623032336235373266343633333262
+36346462373864313738613330653461363664666434336638396662656161366533643063353337
+63643931313539393266613630633636356439323337353537363061353337396137303531333062
+35393633343132353338373034653061316661366232616234626630613938616164323966333237
+35376233613132383630376661333039316164623332373531323833326538613136333137653837
+39363930376531326632663963323432326562383036623463316161306235303839363333663366
+63356436316439366136333464623134633962633331393131313233346233616536396339613763
+37663265383065396336333861626337336365653436336464643839376136663035393939366164
+39643535343262613630643165333137666663383939393732373563386663333332383537323036
+63633734346164646433383565616565323564636131383738653263313630353638343032353662
+30393661396131633334373065323661646434346433376238616238376261643535396163373139
+63363336666262653664623633303130646132393362323436323964346538333533336265633630
+36616135383665363738643331363936303232393864626364356363663530663565643662663235
+64666666386438626634343064363136393332623034306638356634643335666630623831313365
+61663934346537376264323031356133333639613838303336636537633766623733343536656638
+61326537643265623931393233636363656330663737353737643431633531626164666337656433
+38383631636365373534336131646333333532646633343564353437316339303239626238303638
+30656165333133373063646539373131383339626133643231663331343431616231393939366530
+61363863623830656238336335643163653632663862396165623433356636303337333265633464
+39623037346237363531636432383465313263316633653834636639633461386536626239336233
+35396633363034613430393330643034343338356536663437623238323065303062393131363465
+31353465626562643937623932373862623433653138323339333039386563303834653830366662
+64343064323037633836333138626434366330323230313463353162653639343232326661353231
+30383764343138653363323137366663376666313061313532326661343532633563396537366561
+35396134623139386533626464303766313834303735656161383132643130316136323265393638
+61613635313065303931303066616137343238653639656336666439303530343131623635626237
+64383830666335383037323632306337393366373331323639653964343237396230353466363436
+62326162373137306531353261363130323232613866613639313134623266366162333966303163
+31373839626435646535323730363530613737363838383463303730326433353761336333313032
+65666433663333636362363539643238663937323466653134633161633665613961663265346135
+34393565343530336166313332343562383466333737613266323362353065323732343661356665
+33376337653435633265356230346363666231396563393566373534333430363365383062346335
+61383636616565613362636633613366643666643863376139336435616333353262303031303533
+64323338306463303166373862323537303965336332616236613333643064316137333636633065
+31343266663635383065363432653166633761646336613538643162396566373033363265623465
+62633839376639653132623234343937653831336266333735303232366332356138633061356539
+35343330323739613938646234396362393933356230636364366239393537613638393461626432
+39303632333735653764623738373036616433613939393561353765636361646562316235613762
+36323964303135646666346637303865393966373063363138343333626233326534313962663561
+34333935653563386132316230613362343433396130343239326665323638616165313331623736
+34663339633132376133326361333030363233323836323737333461636263303934396133656630
+36383638313362306166316231313064313064386565386662313239636130663130373665336434
+38303231656432316533643637326131323333313161613333303239633639343964376238393332
+61333637363735663861353231313061393538376436343538343939353433663036656332666436
+61316537316137616635376463633833316262313766636532623664363031313461326539323733
+66363261656435646232633466613838393338376538353031636236393931343465306231633137
+32633766613264363031316635386130623738613161313039626634376233636265623565333137
+62633966383065326539313464306230316564623130633637363830616532383265303038313633
+66333436383664363265323263613936666333643739313530663438303061643535646330306636
+37653161326533346434653238613662313537623566646661353065363963653963653331626462
+37623034303238316132393766346331373561343730393631636663663033366664313535303966
+3963336630363238656363396139346463616266666266363632
diff --git
a/dev-tools/ansible/inventories/scigap/smaltr-testing/group_vars/all/vars.yml
b/dev-tools/ansible/inventories/scigap/smaltr-testing/group_vars/all/vars.yml
new file mode 100644
index 0000000..a2eed53
--- /dev/null
+++
b/dev-tools/ansible/inventories/scigap/smaltr-testing/group_vars/all/vars.yml
@@ -0,0 +1,180 @@
+#
+#
+# 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.
+#
+
+---
+ansible_connection: ssh
+ansible_user: centos
+
+user: airavata
+group: airavata
+user_home: "/home/{{ user }}"
+
+# deployment related variables
+deployment_dir: "{{ user_home }}/staging-deployment"
+airavata_source_dir: "{{ user_home }}/staging-source"
+airavata_repo: "https://github.com/apache/airavata.git";
+airavata_dist: "apache-airavata-api-server-0.20-SNAPSHOT"
+airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
+git_branch: param-sweep
+
+# Database related variables
+db_server: "{{
hostvars[groups['database'][0]]['ansible_default_ipv4']['address'] }}"
+db_server_port: "3306"
+db_user: "airavata"
+db_password: "{{ vault_db_password }}"
+mysql_root_password: "{{ vault_mysql_root_password }}"
+app_catalog: "app_catalog"
+exp_catalog: "experiment_catalog"
+replica_catalog: "replica_catalog"
+sharing_catalog: "sharing_catalog"
+workflow_catalog: "workflow_catalog"
+credential_store: "credential_store"
+profile_service: "profile_service"
+
+django_db_username: "django"
+django_db_password: "{{ vault_db_password }}"
+
+# Rabbitmq related vareables
+rabbitmq_server: "{{ groups['rabbitmq'][0] }}"
+rabbitmq_vhost: "master"
+rabbitmq_user: "airavata"
+rabbitmq_password: "{{ vault_rabbitmq_password }}"
+rabbitmq_port: "5672"
+rabbitmq_broker_url: "amqp://{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{
rabbitmq_server}}:{{ rabbitmq_port }}/{{ rabbitmq_vhost }}"
+
+# Zoookeeper related variables
+zookeeper_client_port: 2181
+zookeeper_connection_url: "{{ groups['zookeeper'][0] }}:{{
zookeeper_client_port }}"
+
+# API Server related variables
+api_server_name: "apiserver-node0"
+api_server_host: "{{ groups['api-orch'][0] }}"
+api_server_port: "8930"
+api_secured: "false"
+tls_enable: "true"
+api_server_tls_port: "9930"
+enable_sharing: "true"
+iam_server_url: "https://iamdev.scigap.org/auth";
+iam_server_super_admin_username: "admin"
+iam_server_super_admin_password: "{{ vault_iam_server_super_admin_password }}"
+
+# Orchestrator related variables
+orchestrator_name: "orchestrator-node0"
+orchestrator_host: "{{ groups['api-orch'][0] }}"
+orchestrator_port: "8940"
+api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
+api_orch_log_dir: "{{ api_orch_dir }}/logs"
+
+# registry related variables
+registry_name: regserver-node0
+registry_host: "{{ groups['api-orch'][0] }}"
+registry_port: 8970
+#registry_dir: "{{ deployment_dir }}/registry"
+default_gateway: "scigap"
+
+# Credential and keystore related variables
+keystore_src_path: "{{inventory_dir}}/files/airavata.jks"
+keystore_passwd: "{{ vault_keystore_passwd }}"
+client_truststore_src_path: "{{inventory_dir}}/files/client_truststore.jks"
+client_truststore_passwd: "{{ vault_client_truststore_passwd }}"
+cred_keystore_src_path: "{{inventory_dir}}/files/airavata_sym.jks"
+cred_keystore_passwd: "{{ vault_cred_keystore_passwd }}"
+cred_keystore_alias: "airavata"
+cred_store_server_host: "{{ groups['api-orch'][0] }}"
+cred_store_port: "8960"
+keystores_location: "{{ deployment_dir }}/keystores"
+
+# Monitoring variables
+monitor_email_address: "[email protected]"
+monitor_email_password: "{{ vault_monitor_email_password }}"
+
+# PGA variables
+pga_repo: "https://github.com/apache/airavata-php-gateway.git";
+user_data_dir: "/var/www/portals/gateway-user-data"
+real_user_data_dir: "/var/www/portals/gateway-user-data"
+## Airavata Client related variables
+airavata_server: "tls://{{ groups['api-orch'][0] }}"
+airavata_port: "9930"
+airavata_profile_service_server: "{{ groups['api-orch'][0] }}"
+auth_verify_peer: "true"
+oauth_service_url: "{{ iam_server_url }}"
+
+# Sharing Registry related variables
+sharing_registry_host: "{{ groups['api-orch'][0] }}"
+sharing_registry_port: 7878
+
+# Profile Service related variables
+profile_service_host: "{{ groups['api-orch'][0] }}"
+profile_service_port: 8962
+
+# Keycloak
+keycloak_ssl_keystore_file: "{{ inventory_dir }}/files/keycloak.jks"
+keycloak_ssl_keystore_password: "{{ vault_keycloak_ssl_keystore_password }}"
+keycloak_db_host: "localhost"
+keycloak_db_username: "keycloak"
+keycloak_db_password: "{{ vault_keycloak_db_password }}"
+keycloak_master_account_username: "AiravataAdmin"
+keycloak_master_account_password: "{{ vault_keycloak_master_account_password
}}"
+
+# Helix
+helix_version: 0.7.1
+helix_url:
http://www-us.apache.org/dist//helix/{{helix_version}}/binaries/helix-core-{{helix_version}}-pkg.tar
+helix_dir: "{{ deployment_dir }}/airavata-helix"
+helix_cluster_name: "AiravataDemoCluster"
+snapshot_version: "0.20-SNAPSHOT"
+helix_controller_name: "helixcontroller"
+helix_participant_name: "helixparticipant"
+helix_pre_wm_name: "prewm"
+helix_pre_wm_load_balance_clusters: "false"
+helix_post_wm_name: "postwm"
+helix_post_wm_load_balance_clusters: "false"
+
+# Listening port for kafka installations
+kafka_listener_port: 9092
+kafka_rest_proxy_listener_port: 8082
+
+# Realtime Monitoring related variables
+realtime_monitor_broker_url: "{{ groups['kafka'][0] }}:{{ kafka_listener_port
}}"
+realtime_monitor_broker_publisher: "RealtimeProducer"
+realtime_monitor_broker_consumer_group: "monitor"
+realtime_monitor_broker_topic: "helix-airavata-mq"
+
+# Variables related to the broker in which parsed job statuses are published
+job_monitor_broker_url: "{{ groups['kafka'][0] }}:{{ kafka_listener_port }}"
+job_monitor_broker_topic: "parsed-data"
+job_monitor_broker_consumer_group: "MonitoringConsumer"
+
+# Variables related to platform monitor
+platform_name: "Testing Environment"
+platform_monitor_email_address: "[email protected]"
+platform_monitor_email_password: "{{ vault_platform_monitor_email_password }}"
+platform_monitor_target_email_addresses:
"[email protected],[email protected]"
+
+# Variables related to parser framework
+parser_broker_url: "{{ groups['kafka'][0] }}:{{ kafka_listener_port }}"
+parser_broker_topic: "completed-messages"
+parser_broker_consumer_group: "ParsingConsumer"
+parser_storage_resource_id:
"pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e"
+parser_broker_publisher_id: "ParserProducer"
+
+thrift_client_pool_abandoned_removal_enabled: true
+thrift_client_pool_abandoned_removal_logged: true
+
+usage_reporting_key: "NONE"
\ No newline at end of file
diff --git
a/dev-tools/ansible/inventories/scigap/smaltr-testing/group_vars/all/vault.yml
b/dev-tools/ansible/inventories/scigap/smaltr-testing/group_vars/all/vault.yml
new file mode 100644
index 0000000..90e0dca
--- /dev/null
+++
b/dev-tools/ansible/inventories/scigap/smaltr-testing/group_vars/all/vault.yml
@@ -0,0 +1,36 @@
+$ANSIBLE_VAULT;1.1;AES256
+64353130323432656234373234323330663634653639333262353635323934333030633263343931
+3632616633383062356161643737386563326132306633370a393866343564383761353762346130
+61643331653535616330353235663538646632663365353638356162643430653963623230613363
+3034663435663266620a373933386531343633353636376330643063643666656232376464333232
+61626531333535363864373938356134373730396566613733613363353331323764346564336132
+34323432383739326534633131366530623137653032386332656634643465616236313963336638
+38303331366636316634626461653566643966336438336534393163643032613139333461653931
+64323465343032386631663161336330343430653861396639353364353763393636623133663564
+61336537396434623231363638306561633631663438353263396532336662666364613137353335
+64643336653435643961313062303638333037393233316566336231666461663966636566393166
+35636536623731643038333263623933326332373263306433663261643130633937656437343335
+35383831343862626430393233356566656438393265666666623762383733333833646334396439
+30623132666239333061613031383365323261653634393161366631366532303030366634633335
+65643963393339346231663636653264393834333239646433393534343834393664383631343231
+30336534316361373630306638656366623766356536326535306536656133363264663063346134
+34386334386165333439323930633133346165343039616632306533623162643736316236663333
+64353132623332376262333831613133333835383730613063366330336231303464333132303634
+63613864383733613466653230386534333932623765346430303165643338653236373538376636
+66663239633265633263326534653534306533623561336336363533326663303961396438336361
+39373233393338383332346665646238646633663738656436353139306235616265376363326232
+64316233353338373332636661623330633661663462656664636564323432346438343934376230
+39333964323966363162333062313530356161616364613963336163326635346133383366353233
+61636431376232613835656661376161393230346631366635373339356666393538383130336335
+33313261303162666639336631393238316233323833356161383433363363626263643964353439
+36643639666638623064623839363865373931373063393234613361663661323435643365396334
+63303833343337356133376337346439343331663034643066373638366134633766393232333737
+63623736633463343164626130366565356632366331653732373763663534366532633037663036
+37396632326436363661633165343564353636316139333138393836396633326261636661336630
+39653139393539326630323631313530306232633030656364633337363733386165323432653030
+66656562616566343037653564383964353036626638326435336462643135343262393934363666
+37343039653334633235653762383938316530343132393466363566316436363631373964643938
+37363936383061346563646538653433306136376362366165333966383430376639396664396139
+65303334356663663335626331313865386165346466386137363165626665393562393139353930
+37313930313036333363333530366131343761376332623939356134623561393563366565623039
+353166643162643737323331663438373437
\ No newline at end of file
diff --git a/dev-tools/ansible/database.yml
b/dev-tools/ansible/inventories/scigap/smaltr-testing/group_vars/django/vars.yml
similarity index 51%
copy from dev-tools/ansible/database.yml
copy to
dev-tools/ansible/inventories/scigap/smaltr-testing/group_vars/django/vars.yml
index 1ecc726..91247a2 100644
--- a/dev-tools/ansible/database.yml
+++
b/dev-tools/ansible/inventories/scigap/smaltr-testing/group_vars/django/vars.yml
@@ -19,17 +19,16 @@
#
---
-# Gather facts on the following
-- hosts: api-orch
-- hosts: helix
-- hosts: django
-
-- hosts: database
- tags: mysql , airavata
- roles:
- - env_setup
- - role: database
- become: yes
- become_user: "{{user}}"
-
-...
+user: "pga"
+group: "pga"
+gateway_data_store_hostname: "pgadev.scigap.org"
+gateway_data_store_resource_id:
"pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e"
+django_wsgi_processes: 2
+doc_root_dir: "/var/www/portals/django-{{gateway_id}}"
+admin_emails: "[('SGRC Group', '[email protected]')]"
+django_error_emails: "[('Marcus Christie', '[email protected]'), ('Eroma
Abeysinghe', '[email protected]')]"
+django_database_name: "django_{{ gateway_id }}"
+django_hidden_airavata_apps: "['django_airavata_dataparsers']"
+airavata_django_git_branch: "mft-integration"
+django_tus_endpoint: "https://tus.testing.seagrid.org/files/";
+django_keycloak_ca_certfile_path: 'os.path.join(BASE_DIR, "django_airavata",
"resources", "incommon_rsa_server_ca.pem")'
\ No newline at end of file
diff --git a/dev-tools/ansible/inventories/scigap/smaltr-testing/hosts
b/dev-tools/ansible/inventories/scigap/smaltr-testing/hosts
new file mode 100644
index 0000000..f44a6bc
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/smaltr-testing/hosts
@@ -0,0 +1,23 @@
+[zookeeper]
+149.165.170.222
+
+[rabbitmq]
+149.165.170.194
+
+[database]
+149.165.171.161
+
+[api-orch]
+149.165.170.194
+
+[helix]
+149.165.170.222
+
+[kafka]
+149.165.170.222
+
+[pga]
+149.165.171.161
+
+[django]
+smaltr ansible_host=149.165.171.161
\ No newline at end of file
diff --git
a/dev-tools/ansible/inventories/scigap/smaltr-testing/pga_config/scigap/vars.yml
b/dev-tools/ansible/inventories/scigap/smaltr-testing/pga_config/scigap/vars.yml
new file mode 100644
index 0000000..fb81dcb
--- /dev/null
+++
b/dev-tools/ansible/inventories/scigap/smaltr-testing/pga_config/scigap/vars.yml
@@ -0,0 +1,67 @@
+#
+#
+# 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";
+pga_git_branch: "develop"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/scigap"
+vhost_servername: "pga.smaltr.scigap.org"
+vhost_ssl: True
+ssl_certificate_file: "/etc/letsencrypt/live/pga.smltr.scigap.org/cert.pem"
+ssl_certificate_chain_file:
"/etc/letsencrypt/live/pga.smltr.scigap.org/fullchain.pem"
+ssl_certificate_key_file:
"/etc/letsencrypt/live/pga.smltr.scigap.org/privkey.pem"
+
+## Keycloak related variables
+tenant_domain: "{{ gateway_id }}"
+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://iamdev.scigap.org/auth/realms/{{ tenant_domain
}}/.well-known/openid-configuration"
+
+auth_options:
+ - name: "SciGaP"
+ 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: "scigap"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/scigap"
+gateway_data_store_resource_id:
"pga.staging.scigap.org_aa63ffa0-a99f-4885-8f4b-81e3c4c4d737"
+
+## Portal related variables
+super_admin_portal: "true"
+admin_emails: "['[email protected]']"
+portal_email_username: "[email protected]"
+portal_email_password: "{{ vault_portal_email_password }}"
+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/smaltr-testing/pga_config/scigap/vault.yml
b/dev-tools/ansible/inventories/scigap/smaltr-testing/pga_config/scigap/vault.yml
new file mode 100644
index 0000000..1d2a8b0
--- /dev/null
+++
b/dev-tools/ansible/inventories/scigap/smaltr-testing/pga_config/scigap/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+34623763663932613934396339323637333835663464336564373661626236336261396635316337
+3362356635323931373631316232373061333835653833340a653039333334356239653664396666
+31646231376363336237613264353439653433303763326665353361623931306231393661323331
+3930646330633832350a306633393533333930333133333732393865393332396636303564616666
+62666137313436663563663438313338396139633535633030616232616638396636393132633463
+37343434343333396466313733393465663365396635333631653662353830363463386631666564
+36393530326233323135623036373731633831303338396563346361316235353461663434643563
+63636266316363396165643164323061343162353864343432626337333037633030643466396230
+30353038623662623136303634336137326261643231356230313634386266316364653438373232
+64623736626632343738666430396431333335323831346466663136383435336263626133353530
+66386238383730376365336433353763633964313830386464353138633063376638386237343030
+66353437346239343439343166653330616663663736366262643537353333313961313130666461
+31666265643830303437313538323738656464316539343361383230346534653733653164313134
+65323932623133343666366164663732303239366163363538306135313736326132353462393663
+33363035346463336637383332646633373866613838643863323864663464383837363433306431
+34313334666330346338613832616462346335613366326631616638613866353834356436636331
+3533
diff --git a/dev-tools/ansible/database.yml
b/dev-tools/ansible/pga-scigap-smaltr.yml
similarity index 78%
copy from dev-tools/ansible/database.yml
copy to dev-tools/ansible/pga-scigap-smaltr.yml
index 1ecc726..b5ad63d 100644
--- a/dev-tools/ansible/database.yml
+++ b/dev-tools/ansible/pga-scigap-smaltr.yml
@@ -19,17 +19,5 @@
#
---
-# Gather facts on the following
-- hosts: api-orch
-- hosts: helix
-- hosts: django
-
-- hosts: database
- tags: mysql , airavata
- roles:
- - env_setup
- - role: database
- become: yes
- become_user: "{{user}}"
-
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir
}}/pga_config/scigap"
...
diff --git a/dev-tools/ansible/roles/common/defaults/main.yml
b/dev-tools/ansible/roles/common/defaults/main.yml
index e5635e1..881faeb 100644
--- a/dev-tools/ansible/roles/common/defaults/main.yml
+++ b/dev-tools/ansible/roles/common/defaults/main.yml
@@ -22,5 +22,5 @@ keystore_src_path: "airavata.jks"
client_truststore_src_path: "airavata.jks"
cred_keystore_src_path: "airavata_sym.jks"
-apache_maven_version: "apache-maven-3.6.2"
-apache_maven_url:
"https://www-eu.apache.org/dist/maven/maven-3/3.6.2/binaries/apache-maven-3.6.2-bin.tar.gz";
+apache_maven_version: "apache-maven-3.6.3"
+apache_maven_url:
"https://www-eu.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz";
diff --git
a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
index a0fe5be..7e72cdb 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
@@ -161,7 +161,7 @@ CREATE TABLE EXPERIMENT_OUTPUT_VALUE
EXPERIMENT_ID varchar(255) NOT NULL,
OUTPUT_NAME varchar(255),
OUTPUT_VALUE varchar(2048),
- PRIMARY KEY(EXPERIMENT_ID,OUTPUT_NAME,OUTPUT_VALUE),
+ PRIMARY KEY(EXPERIMENT_ID,OUTPUT_NAME,OUTPUT_VALUE(255)),
FOREIGN KEY (EXPERIMENT_ID,OUTPUT_NAME) REFERENCES
EXPERIMENT_OUTPUT(EXPERIMENT_ID,OUTPUT_NAME) ON DELETE CASCADE
)ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -430,8 +430,8 @@ CREATE TABLE CHILD_JOB_STATUS (
)ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE EXPERIMENT_PARSING_TEMPLATE(
- EXPERIMENT_ID varchar(2048) NOT NULL,
- PARSING_TEMPLATE_ID varchar(1024) NOT NULL,
+ EXPERIMENT_ID varchar(255) NOT NULL,
+ PARSING_TEMPLATE_ID varchar(255) NOT NULL,
PRIMARY KEY (EXPERIMENT_ID, PARSING_TEMPLATE_ID)
)ENGINE=InnoDB DEFAULT CHARSET=latin1;
