You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2023/07/31 17:16:42 UTC

[airavata-custos] branch staging updated: staging ansible changes

This is an automated email from the ASF dual-hosted git repository.

isjarana pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git


The following commit(s) were added to refs/heads/staging by this push:
     new 13a0a59e7 staging ansible changes
     new ceb3374fc Merge pull request #393 from isururanawaka/develop
13a0a59e7 is described below

commit 13a0a59e7705491a981cfe435fff08b58abb8283
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Mon Jul 31 13:15:26 2023 -0400

    staging ansible changes
---
 ansible/custos.yml                                 |  26 ++--
 .../inventories/staging/group_vars/all/vars.yml    |   4 +-
 .../inventories/staging/group_vars/all/vault.yml   | 173 +++++++++++----------
 ansible/inventories/staging/hosts.yml              |  12 +-
 ansible/roles/keycloak/tasks/main.yml              |  16 +-
 5 files changed, 116 insertions(+), 115 deletions(-)

diff --git a/ansible/custos.yml b/ansible/custos.yml
index 52d992df2..a6dc8a352 100644
--- a/ansible/custos.yml
+++ b/ansible/custos.yml
@@ -31,19 +31,19 @@
 #    - role: migrate_db
 #      tags: [migrate_db, never]
 ### enable following for fresh deployment
-#- hosts: hashicorp
-#  roles:
-#    - role: env_setup # execute env_setup role only when env_setup tag is specified
-#      tags: [env_setup, never]
-#    - nginx
-#    - consul
-#    - vault
-#- hosts: keycloak
-#  roles:
-#    - role: env_setup
-#      tags: [env_setup, never]
-#    - nginx
-#    - keycloak
+- hosts: hashicorp
+  roles:
+    - role: env_setup # execute env_setup role only when env_setup tag is specified
+      tags: [env_setup, never]
+    - nginx
+    - consul
+    - vault
+- hosts: keycloak
+  roles:
+    - role: env_setup
+      tags: [env_setup, never]
+    - nginx
+    - keycloak
 - hosts: custos
   roles:
     - role: env_setup
diff --git a/ansible/inventories/staging/group_vars/all/vars.yml b/ansible/inventories/staging/group_vars/all/vars.yml
index e81f8834c..d0644b41f 100644
--- a/ansible/inventories/staging/group_vars/all/vars.yml
+++ b/ansible/inventories/staging/group_vars/all/vars.yml
@@ -34,7 +34,7 @@ custos_domain: "{{ hostvars['custos']['domain'] }}"
 custos_deployment_dir: "{{ user_home }}/custos-deployment"
 custos_source_dir: "{{ user_home }}/custos-source"
 custos_repo: "https://github.com/apache/airavata-custos.git"
-custos_git_branch: develop
+custos_git_branch: staging
 custos_integration_services_source_dir: "{{ user_home }}/custos_integration_services_source"
 custos_core_services_source_dir: "{{ user_home }}/custos_core_services_source"
 custos_distribution_version: 1.1-SNAPSHOT
@@ -102,7 +102,7 @@ consul_install_dir: /usr/local/bin
 consul_config_dir: /etc/consul
 consul_data_dir: /var/data
 
-active_profile: dev
+active_profile: staging
 
 apache_maven_version: "apache-maven-3.6.3"
 apache_maven_url: "https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.2/apache-maven-3.6.2-bin.tar.gz"
diff --git a/ansible/inventories/staging/group_vars/all/vault.yml b/ansible/inventories/staging/group_vars/all/vault.yml
index 6ae9172f1..52023e2c6 100644
--- a/ansible/inventories/staging/group_vars/all/vault.yml
+++ b/ansible/inventories/staging/group_vars/all/vault.yml
@@ -1,87 +1,88 @@
 $ANSIBLE_VAULT;1.1;AES256
-32643332623135616636643661633434343164313738306463356231306436346439666239383666
-6231663632376261363562623663393934666432656563650a333130653234383366643834656237
-33386631626132373935623464656661356339353038353937363265303338656464333732366530
-6365363730323139620a636263303162323266306563326266363166303366313938383637303437
-64333562346539373730373962316438656665386465393865643330303165373934396135653639
-63386538663461636236333265346462373430376363613033626163663937393261316132316463
-66353530343162303936653738656464626638656364303134623266373961316435663239653336
-37666239396230356237633365363031306165643837663236353564663562313438646361663636
-65343237333664346666303834333065653063333662666438366133393538623336343834643235
-35346664373138663638393632363738653861383435306633373133373537396630373536393734
-38633739613463396130653763346538613761616665386137386462306430346230316336356133
-64313439363561333633356139366139393433363262306531353665396565343331313365333939
-63303736316637366365393566333731383730303364356234356238633730393334663662613963
-38316133356636383732316332326535313138386635623135393038623230386364376364313630
-38633537363731313662366336326664353365386639326430316566633638623332303935353739
-33303035383063386333633637303366363266303639616532613534313938356234396662326137
-39386132343663636130636234666230316336333963373864643065393339623835646465663135
-34386630306464313466376462653461303234643835363166323461323038653534333162363863
-30373837336235326662303766363438376162656532636566616234383435623364396463643435
-32636236626138313138386266653735616662623164343763323831666436356666313566333462
-32363566613731323866633637346136356432656539376632663739626133353163373535663939
-62656563373833666636323232363763316232663765353231366634633135393561663837313366
-38643239626636396336626235366337373261326166336632356135613662376362626637376262
-34366130393565336266393134643866613265303563343266333435353665643531343363366238
-63356130353664306638663436623333346137346564636430633064316237363334373630626365
-63643261653930623566313131316637663966633830343933313933313465373566373232363762
-65343333343939663366316562373239646434376537316632376166373863363136363034313763
-38313663643363396433623738366133306635616234643736346432343033636531383666616235
-63393965353336343832346664366661643835363333356533363533663339333666393637396664
-61376361353463646434333863666337653561633434326538333935343339316439306634646430
-63363864336664316261616265653231366638383939373934346635376532313366396535306133
-63633339323431666337376663393933336437383466343261313831616336376163623761353366
-34623066616136393133313733663966643735653138323061623738383030646239666336626531
-36353534353433333432363661386365363066653536393430636334396534326461313963373762
-32633339363931633065373433346430613262616563626161643636363762343466653136366464
-62656363333535356232623038366438373462353532396565623531613266666237303266386262
-33316630386261386465356132643634336236613335383563616538613330636339363461316363
-61326139303062343332643632323939333533323662653362396535616565663761623732363638
-36383065363336643139393839386539316137653431646465323062316234316430306563613931
-64343132396162386565386334666163313334383035313531666366613637343030643730376566
-36326433363131636336336661363732343566326133326336343966643235323339363163623638
-36616265393264393861303635633861616432636638633238636638323166343537316534653333
-32396661616430353932653733313863346161623563633435646361393838326336373538386439
-36383639386461613362386261363031633836623064396263363534336565303638343263386461
-38663034396534633033303834383133643530613664303132376166663339316163333862613036
-65343037353136363630383339376638343837383066333134613735336262633034653064373262
-30376334646463393636613430353863363464326530663465656663646434666664323739663834
-36336261393763353761393261373331653139386533636332303964313133353839316538633236
-36643235366637333563383864323461313332383662623932623333313039323638383033653566
-31356437353465396239343938306234666531616165326439333364303130346463323666393565
-39623762376338356237336666393336353765333934336134353434643534666535306136616663
-34656633626163306139666134306132633537623937393963323631343938666638616464313731
-64613938396539613765366563376563393230393061386666376135393361336165666333376565
-31613866363733306439666139313236636662613539353861636538343632613966393665323166
-32366533336361313636306137653334396163323934306334353333303535383033366333323666
-30383239666132376262363237383239666666346134323966383266333134373237356532353463
-61366235336236653430326133336263323065333830366166383865393439376162373761666462
-66353661653730363336363766303530313335376466643136343662313739323638346234366430
-35386330336431656165376638323834346235633366303664613538623634613331623966303731
-31313162633864393334356133363130353862613035303239306330663938666661306462613262
-31653336366131633830316366316436363938626636376637643533616339303663653334313935
-39346532396266333831643636363862393434386333323130373665343431346564646266666165
-64373035643536396161623362613435643263366165313932323832636338333534653162353432
-32653234636638386533633637616531643735316264376338653263646333373665313830333730
-39336566613837336532666432626164383037303738616363653931613863613634643133346536
-36653565383430613161366539653037353565393831323333363865313162343030623361653536
-64383139636138613031663334376234303338356466336330333862626436343534356463653134
-62306563613930336164636666643539386230663139633434343835623265336430393763326363
-36373236393266323464326161343535353063383565646165383732366131363564643166323031
-33323839313534646465353130336366303133363466303233616430373565343130383236393332
-38393834303733323638393334393865626438316637633533353865663539383237373931346365
-32663539643566346166336266626633333339663435663330653635663362353730333366623132
-37306261616664343435306139333161376266663039363737646561303061623039373332383133
-62343437363533613438326434313331383661663832366132396361656364323036633737303232
-32336239666230386162303764303039663231626165353832323530376165646366346665313763
-64633830663763616266633762323832353466616162656562303362616537373736643863326538
-32653036616331336535316365633963646436616166393137353262633265373532653862316231
-35356633306261656231616561306564303161356631633866303235386633363462383363623830
-37646639666636373639386663313536343938333665316237663339613162653166613734643761
-38343366656132313065346634353233656564383436336463613230623232653736636266383239
-35373165356330376435373662373933383430353037626630313463393464663463363062333939
-32376233303436613933376139633461643761336365363033343337343666623532626264373866
-34356437313830333730313038643265643236393864396333313563343339333434343464336232
-39376633613464373038356432636337643436326164663863663935316138343739326665363363
-37643931313532343539366662346537316230613363633161613364383966313637396338303734
-3131393239613463326661313631373939396132323730623964
+39643664663234373630373663353432303034633663643337333836663436626466623438393065
+3839313462656133343637633264633062356166383861300a663338653263386630376264313461
+30666636613530646665353136623938666434316633346161656538386636633533346433353139
+3164313939313131390a356632323261323233636633626632386339333365613835363437366336
+35353764343266383639643939343235623136636233396633323161666264333764333632306637
+36623430636631643661663266653861663965376335613861333866613766633035363538363165
+63633930386234303465646530623236383435396135636336613864373734373465336364373431
+35326663353538383239383432313138303864353935633263663436636138663938633735336264
+35386336363461386139316539633432313839353735303733353065303232316539616439613066
+30376665646333366533363535666537366137616231323034326434393038356433396263353463
+37316433353836613931656562656363303761353762376633393562393562303237366230373930
+38353166653135306561326635376139393561346630333937323136333430343064373133666664
+64353631353736353765386635323136366364613338376635383935396366353339356330636436
+39303565346235356239356364323833336537336234633363626636333530623866316562373531
+63383863646261313834383332616636323835376135623463303661633431356430653364326234
+65636364303264346235333837633464316232653435333663313464633663373862336562356232
+31333365333733643065303335376635623430306264353930356561623733323663613238623138
+38396164366361643434396437663336623864303232313262633864646162363233646437316139
+38323634373232623666613236353661303265643630623165333566393333643162373066313961
+64656332626138386539653761316131623038613338306434633438326664653231393239363038
+30373939643935386661623534343936663833633965653862313939326435623865336661333638
+39396631636139633039626565323033613961613264363037623232643134633661343933386161
+31623661353363646535386131356164366335323031313939353463653939316634313837356430
+32633730373135626334626266343933313066393662396331626235326532636662623566663533
+36636363396361326166636530353338363131393432323439356539653564373365636438323030
+31633538396434346561313563663966393262623839386333636163653539353566363461616364
+64323765336434343264646639616631306234356135313164376639323533326132336433633334
+64343739663862393165653464396564363138316438613862333561346263313938336135306437
+61366135653864346165666263626235666238383332633433353938666231643365663466663963
+33653632626430356332666532383832383561356632623439663836396533643662623731363062
+34333438613635313431333166646161346533666465323734653632313133383032336332623064
+30656464363537363333633464333163363162336138626435656237326231643462616632643138
+39356532376666383161343631663235663063323539396532373938346266393438313264623436
+62643031633264376537323436386165623366323862613133666332353437656466623365323266
+36643462343933373364363938376164373737626431393134646439666136306333343663623061
+39653931363834333134663731393530373432373731373366343836353363303362663862356438
+39306366386632663737376333393731646466343338333737326338386332313039386331366466
+64343164616534353065333365613666346563373736313963323466353036656666303439323633
+30623765353434613164643937653439306532323234333265663165666236313332646130353633
+65396639383839636531663462623465383636656166656266396235316433643837336439333163
+64623132353034633335313865336336343736343132373538623263633137333238386439303665
+34396166656433303662666533376537313162316265633839666335616432376232306431653366
+34393231613034623339616663393937643736386330376666313036623939333430396664323238
+61356533356566346661613361376561623530333438613365383539323936353439653739373832
+30373933376638373232396434653734626532373162366561666138633135316332333736313639
+37323439646133396637636130636461386330643836663365386263316134376132323333386234
+37343965653761346264323037613063666232613663353663653938656464323538646337636364
+66336466626461646339353465343131336238343562326134343737663339326665613930376164
+33653631633831663437343063633966313061363039383763316539653861373139613836663336
+37373931393730656465386664646531373266353535303331613333616266656338613366643333
+64333038646361656633363166623232356164383766656565376536313166633935613664653565
+31643664663566646166646536623966366439366239373133303662366536386463653634646564
+61626334366435323834656132633865666231363764396338653161363135326161383766363135
+62643330393166303566303665306533623038313861306465386332333563653837643435613937
+66313534323931636533396539353364323466316331366131363136376162353033393133386135
+35636337316462346539663030376234356239656333633539663935366434633030646335643938
+63376366326433623866333764636430353336316165613235313632366162396336393239613234
+63616232636237336162343638616630383061393731623162356534623062663564613438396162
+30653961346262393135333730373038613838623561313263373262346137346361333661666666
+64366334626364613738363335623938393831323066623735356332363339313361316536353962
+64343264613236303638393261393761393139656461306261643036613263343332363764396332
+39313435363065633533346233306436323230613438613436363662613538326238323433353363
+65373661313566626235656131353231373338383233303237383337303931386264656536313837
+39666339356235333664343837386661313865623939643065623731643532316536653334386230
+63343332366330366263323833356162643137343236356530613664346531313231336130356138
+39326339343035373431306534303066333661303930346632333831343132376334616563383531
+35323661653334313238306638323961303336366434383032303938343535623664623962626663
+62653038353533323231633038623235663362656461646235393836613336326263303665656666
+30636339343936643339303535333535383935343538343431303862313930333637353139393934
+65353361653061623462366534373137373733616264623566373935303164613436653062313763
+30663164623461663862613632663762656533643964623366333236633630626138343633373030
+34353562666436633262653035383336353161626561326430323862663135373531623866313135
+34616664653061313165343133323265393231313330653961353939653939333862393835366337
+37656361313434656435613639376537396538653064646137316636343566333464356238333935
+36396634383932343965613932626630646164643932313666643433383766353365373630396361
+32646433316239643265313266376566333465376335306164353733663831316237663031323831
+35393064346134363064653831383863393034656537346461356364643462383966366632633232
+31313139373137303730303362323261356437663634316433346633316333333833316461383263
+31353439636535336366363163313835663237626233643564636535646537636364643261646437
+61663531313566363231373165316366643561623236326132626161346163363838653763306138
+35383337613338336230373930313232303139626663373562323066373766643633373766386266
+35306465356663613230373933313033613063616462346232373866653038383066386135626334
+39653265663065333333306336653134343035396530653438643639313037343032353032363833
+31666365373531643063313139323266333536623964636231623732303938616132343233393233
+65333361326263326434343731316136383933396664613239653663343433393166353734333433
+38336133653964636635666432353234363761303339643938613931316537303734356630303935
+343963363531353938613562383039353464
diff --git a/ansible/inventories/staging/hosts.yml b/ansible/inventories/staging/hosts.yml
index 1a4228218..5ccbdd252 100644
--- a/ansible/inventories/staging/hosts.yml
+++ b/ansible/inventories/staging/hosts.yml
@@ -22,20 +22,20 @@
 all:
   hosts:
     custos:
-      ansible_host: dev.custos.usecustos.org
+      ansible_host: staging.custos.usecustos.org
       ansible_user: exouser
     keycloak:
-      ansible_host: dev.keycloak.usecustos.org
+      ansible_host: staging.keycloak.usecustos.org
       ansible_user: exouser
     hashicorp:
-      ansible_host: dev.vault.usecustos.org
+      ansible_host: staging.vault.usecustos.org
       ansible_user: exouser
     old_custos:
-      ansible_host: dev.custos.usecustos.org
+      ansible_host: staging.custos.usecustos.org
       ansible_user: ubuntu
     old_keycloak:
-      ansible_host: dev.keycloak.usecustos.org
+      ansible_host: staging.keycloak.usecustos.org
       ansible_user: ubuntu
     old_hashicorp:
-      ansible_host: dev.vault.usecustos.org
+      ansible_host: staging.vault.usecustos.org
       ansible_user: ubuntu
diff --git a/ansible/roles/keycloak/tasks/main.yml b/ansible/roles/keycloak/tasks/main.yml
index 772301e32..631cb5ff9 100644
--- a/ansible/roles/keycloak/tasks/main.yml
+++ b/ansible/roles/keycloak/tasks/main.yml
@@ -47,14 +47,14 @@
   become: yes
   become_user: "{{ user }}"
 
-- name: Run Keycloak maven build
-  command: mvn -Pdistribution -pl distribution/server-dist -am -Dmaven.test.skip clean install chdir="{{ keycloak_source_dir }}/"
-  environment:
-    MAVEN_OPTS: "-Xmx2048m"
-  register: build
-  tags: update
-  become: yes
-  become_user: "{{ user }}"
+#- name: Run Keycloak maven build
+#  command: mvn -Pdistribution -pl distribution/server-dist -am -Dmaven.test.skip clean install chdir="{{ keycloak_source_dir }}/"
+#  environment:
+#    MAVEN_OPTS: "-Xmx2048m"
+#  register: build
+#  tags: update
+#  become: yes
+#  become_user: "{{ user }}"
 
 - name: Delete configuration directories of the distributions
   file: