This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
The following commit(s) were added to refs/heads/develop by this push:
new 946fd6429 adding staging ansible
new b5236bd41 Merge pull request #390 from isururanawaka/develop
946fd6429 is described below
commit 946fd6429004ada45e5b66813fc73eb8c7b22ce9
Author: Isuru Ranawaka <[email protected]>
AuthorDate: Fri Jul 14 17:38:34 2023 -0400
adding staging ansible
---
.../files/keycloak-client-truststore.pkcs12 | Bin 0 -> 1702 bytes
.../inventories/staging/group_vars/all/vars.yml | 108 +++++++++++++++++++++
.../inventories/staging/group_vars/all/vault.yml | 87 +++++++++++++++++
.../inventories/staging/host_vars/custos/vars.yml | 24 +++++
.../staging/host_vars/hashicorp/vars.yml | 24 +++++
.../staging/host_vars/keycloak/vars.yml | 24 +++++
ansible/inventories/staging/hosts.yml | 41 ++++++++
.../apache/custos/iam/service/IamAdminService.java | 2 +-
8 files changed, 309 insertions(+), 1 deletion(-)
diff --git
a/ansible/inventories/staging/files/keycloak-client-truststore.pkcs12
b/ansible/inventories/staging/files/keycloak-client-truststore.pkcs12
new file mode 100644
index 000000000..4ccb397f8
Binary files /dev/null and
b/ansible/inventories/staging/files/keycloak-client-truststore.pkcs12 differ
diff --git a/ansible/inventories/staging/group_vars/all/vars.yml
b/ansible/inventories/staging/group_vars/all/vars.yml
new file mode 100644
index 000000000..e81f8834c
--- /dev/null
+++ b/ansible/inventories/staging/group_vars/all/vars.yml
@@ -0,0 +1,108 @@
+#
+#
+# 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
+
+user: custos
+group: custos
+user_home: "/home/{{ user }}"
+
+# Domain names for VMs
+keycloak_domain: "{{ hostvars['keycloak']['domain'] }}"
+hashicorp_domain: "{{ hostvars['hashicorp']['domain'] }}"
+custos_domain: "{{ hostvars['custos']['domain'] }}"
+
+# deployment related variables
+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_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
+
+# kafka variables
+kafka_listener_port: 9092
+kafka_url: "{{ ansible_host }}:9092"
+zookeeper_client_port: 2181
+zookeeper_connection_url: localhost:2181
+zookeeper_connection_timeout: 18000
+
+custos_host: "{{ hostvars['custos'].ansible_host }}"
+
+envoy_host: "{{ hostvars['custos'].ansible_host }}"
+envoy_port: 10000
+
+
+#Keycloak
+keycloak_vhost_servername: "{{ hostvars['keycloak'].ansible_host }}"
+keycloak_repo: https://github.com/keycloak/keycloak.git
+keycloak_source_dir: "{{ user_home }}/keycloak-source"
+keycloak_deployment_dir: "{{ user_home }}/keycloak-9.0.2"
+
+# Database related variables
+db_name: core_services_server_db
+
+java_home: "/usr/lib/jvm/java-17-openjdk-amd64"
+
+sharing_subnets:
+ - "149.165.152.112/16"
+# - "140.182.0.0/16"
+# - "149.165.0.0/16"
+# - "192.68.133.0/24"
+# - "192.12.206.0/24"
+# - "149.159.0.0/16"
+# - "156.56.0.0/16"
+# - "149.161.0.0/16"
+# - "149.160.0.0/16"
+# - "149.166.0.0/16"
+# - "134.68.0.0/16"
+# - "129.79.0.0/16"
+
+# application properties for Custos Core services
+custos_core_grpc_port: 7071
+custos_core_server_port: 8081
+
+
+
+custos_int_grpc_port: 7070
+custos_int_server_port: 8000
+
+
+# vault variables
+vault_port: 8200
+vault_scheme: http
+vault_host: "127.0.0.1"
+vault_uri: "http://127.0.0.1:8201";
+spring_cloud_vault_authentication: token
+
+
+# consul variables
+consul_version: 1.12.1
+consul_zip_file: consul_{{ consul_version }}_linux_amd64.zip
+consul_install_dir: /usr/local/bin
+consul_config_dir: /etc/consul
+consul_data_dir: /var/data
+
+active_profile: dev
+
+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
new file mode 100644
index 000000000..6ae9172f1
--- /dev/null
+++ b/ansible/inventories/staging/group_vars/all/vault.yml
@@ -0,0 +1,87 @@
+$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
diff --git a/ansible/inventories/staging/host_vars/custos/vars.yml
b/ansible/inventories/staging/host_vars/custos/vars.yml
new file mode 100644
index 000000000..cbc60cc54
--- /dev/null
+++ b/ansible/inventories/staging/host_vars/custos/vars.yml
@@ -0,0 +1,24 @@
+#
+#
+# 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.
+#
+
+---
+pkcs12_filename: 'custos-client-truststore.pkcs12'
+pkcs12_passphrase:
+nginx_site_config: site.conf.j2
\ No newline at end of file
diff --git a/ansible/inventories/staging/host_vars/hashicorp/vars.yml
b/ansible/inventories/staging/host_vars/hashicorp/vars.yml
new file mode 100644
index 000000000..df45e25b3
--- /dev/null
+++ b/ansible/inventories/staging/host_vars/hashicorp/vars.yml
@@ -0,0 +1,24 @@
+#
+#
+# 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.
+#
+
+---
+pkcs12_filename: 'vault-client-truststore.pkcs12'
+pkcs12_passphrase: "{{ hashicorp_pkcs12_passphrase }}"
+nginx_site_config: site.conf.j2
\ No newline at end of file
diff --git a/ansible/inventories/staging/host_vars/keycloak/vars.yml
b/ansible/inventories/staging/host_vars/keycloak/vars.yml
new file mode 100644
index 000000000..30c06a724
--- /dev/null
+++ b/ansible/inventories/staging/host_vars/keycloak/vars.yml
@@ -0,0 +1,24 @@
+#
+#
+# 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.
+#
+
+---
+pkcs12_filename: 'keycloak-client-truststore.pkcs12'
+pkcs12_passphrase: "{{ keycloak_pkcs12_passphrase }}"
+nginx_site_config: "{{ ansible_host }}.j2"
\ No newline at end of file
diff --git a/ansible/inventories/staging/hosts.yml
b/ansible/inventories/staging/hosts.yml
new file mode 100644
index 000000000..1a4228218
--- /dev/null
+++ b/ansible/inventories/staging/hosts.yml
@@ -0,0 +1,41 @@
+#
+#
+# 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.
+#
+
+---
+all:
+ hosts:
+ custos:
+ ansible_host: dev.custos.usecustos.org
+ ansible_user: exouser
+ keycloak:
+ ansible_host: dev.keycloak.usecustos.org
+ ansible_user: exouser
+ hashicorp:
+ ansible_host: dev.vault.usecustos.org
+ ansible_user: exouser
+ old_custos:
+ ansible_host: dev.custos.usecustos.org
+ ansible_user: ubuntu
+ old_keycloak:
+ ansible_host: dev.keycloak.usecustos.org
+ ansible_user: ubuntu
+ old_hashicorp:
+ ansible_host: dev.vault.usecustos.org
+ ansible_user: ubuntu
diff --git
a/custos-services/custos-core-services/iam-admin-core-service/src/main/java/org/apache/custos/iam/service/IamAdminService.java
b/custos-services/custos-core-services/iam-admin-core-service/src/main/java/org/apache/custos/iam/service/IamAdminService.java
index 5fb2ccb69..d687bdc5d 100644
---
a/custos-services/custos-core-services/iam-admin-core-service/src/main/java/org/apache/custos/iam/service/IamAdminService.java
+++
b/custos-services/custos-core-services/iam-admin-core-service/src/main/java/org/apache/custos/iam/service/IamAdminService.java
@@ -2041,7 +2041,7 @@ public class IamAdminService extends
IamAdminServiceImplBase {
responseObserver.onCompleted();
}
}
- {
+ else {
responseObserver.onError(io.grpc.Status.NOT_FOUND.withDescription("Agent not
found ").asRuntimeException());
return;
}
