Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug fixes #311

Merged
merged 5 commits into from
Jun 7, 2024
Merged

Bug fixes #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4f81b9
Reroute to the jempi-api-kc
bradsawadye Jun 5, 2024
f32a132
Add more ssh keys
bradsawadye Jun 5, 2024
dac2806
Fix typo
bradsawadye Jun 6, 2024
1c9b684
Use the postgres service instead of pgpool
bradsawadye Jun 6, 2024
7878a5e
Fix failing tests
bradsawadye Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client-registry-jempi/docker-compose.combined.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ services:
jempi-bootstrapper:
image: jembi/jempi-bootstrapper:${JEMPI_BOOTSTRAPPER_IMAGE_TAG}
environment:
POSTGRESQL_IP: ${JEMPI_POSTGRES_DB}
POSTGRESQL_IP: ${POSTGRES_SERVICE}
POSTGRESQL_PORT: 5432
POSTGRESQL_USER: ${JEMPI_POSTGRESQL_USERNAME}
POSTGRESQL_PASSWORD: ${JEMPI_POSTGRESQL_PASSWORD}
Expand Down
2 changes: 1 addition & 1 deletion client-registry-jempi/docker-compose.dgraph-zero-cluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:
replicas: 1
placement:
constraints:
- node.labels.name == ${JEPMI_ZERO_02_PLACEMENT}
- node.labels.name == ${JEMPI_ZERO_02_PLACEMENT}
resources:
limits:
memory: ${JEMPI_ZERO_MEMORY_LIMIT}
Expand Down
16 changes: 16 additions & 0 deletions infrastructure/ansible/inventories/development/group_vars/all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ sudoers:
username: matthewerispe
state: present
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwfQ8ypu5+4rGNfMeSzB+ADffE4qT/519AFVDTIWgV4FaJipsgHdYFTVnxkJHAiixTKAqEJ2SF1RJ2/pIH2hX5p2GNWhrXuOmnqiOZEByPSsqidSNS8aMCfIzt7UZ6XvIPhagZnEQ7NCA1BOuOqzWISIEKjSqA3MvfZ5kniis5J9cbTqkGB+pgW75fuQIxtmK7iCZbwuXOO735PzkKgeT/vfg4fTlbmOeikSNO6QaamGRZ+NJfprCIx5j5GKc970k6V9d4RcQltHojgWI7Wl2VRLsprm7Xy2keaTGXfjnCDwQ2cQRUgBqIoWyDoUzNqvDYXrEAfM19sNEICMx90fXaJeGrNbMg2jjWuyPacSnB0moDtECt4zd2svozGEWnVvdY8KDAWgMbTUlrufNOzh7hyrDMpaBSmSN9npyTpekM0kWlykfU++oEexXMi41b0cZLJc9ocPJCeKZ0fzpachHW35zsUh2E6OCgbXdDxNugVrG4ecz9nUqjJGyYhCX6mhz9VxpB46wEPQ/E2rTsnIfd+xMYoyLqLzCfKf/Z8CL8/Ifq7uDRxczRmo5sCrjByOdwyUGY+JoFQMc5OcEzfyepVmcwfuhuASBGAZOr1zM1ituqG614d7W+GDRHwCeAS8zUZKFdYvL5C4nOg+OxojqnC8zSGwN3ZcnMXHvvzKdQHw==
- name: [email protected]
username: martinbrocker
state: present
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCun3EuZ1sAP8/Drg3GkcNrIAMvoYQUXO2x1fMCAyLadMOvs9avpaKXnBrj5v5AxkGcHb3klLWwFOwJRKZMA4Y0wcWlF1B5DWLYHCwvkVKp/021pHS9YLYVST4rEDCuJnhnzKGEWiQpsCFGrLyW5Y5PWEV/XHW1otg4MnDaJvBy77gVxNjpITau7AGXMKRJ7kDvQm0D7AvydGJgH5iR3LLubiwnfQ7dH95XIbhGVsOphIaLO/QxvaPgCYkd34fYirRejbUuIYE/qCEhIvQQPjH+Q4CHDhnBUT3WybEXBQlczJ2UnWhSCrDJvlA34i7R+G45Pl3TlGWilw0jNVN/NYK23W45ZR3hB1KGfN69fN5/XgfWKTFn9wqeaK1ioH8uTIgZhpwumlZlMiD+smz8p6g+GNTb84WqgsBWDmEBtzJV/COiIS37+ud2orGIpPEzSxpWz23YMdFAzQT9f3VbFTNkzb7zkm7qPGD2avoG8B4tg9gbK7sWJWOKkC+zjCq+AXc=
- name: [email protected]
username: derrickrono
state: present
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDNh4PK3dE8ZOEbD+CZSisHl8R0r7aAcFL48tW10Kv+EcuTlAH3Du6bHh2OrGgU9XC933WDbyUcB0N+T+wv9XJudVWE6708JoSflbW93nCiOojq+GkpbiCXHkTwvbV2MLtKOUCQQFD65umZ5/p568vpay6bWUfsFso/PjJ1zIktW9EYuK83mGU0C+F74nDZfmwc3CB1N8u6fgviFANfPZvE//If09MU6jMaSGc5umX2tIfH0n/OEal3jNsJgXu+5irUupJ56I39d4Zym+4DbaShsoXUz9PMvnlXd194aswJlEwlxcW4/lmq3IbW62kvMFf3UePTK6O4piE1Ci2XHlxnEUOzIz5FAnktd9FtDsGxynAVlvdLA93TJXwQ6FGtTQAuIWGXukOWwT11IATj+CSuhOOvsa/VAG2NZKsxlCex3F6V0FKmPir7OZXzLXkEMaW8UgKpGqZ6oaRY1pGOWIzuqyqP50Fakc+X+tV8QzKJN8TQu1A/RSvVX0DKOAYTC0M=
bradsawadye marked this conversation as resolved.
Show resolved Hide resolved

docker_users:
- name: [email protected]
Expand All @@ -50,6 +58,14 @@ docker_users:
username: matthewerispe
state: present
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwfQ8ypu5+4rGNfMeSzB+ADffE4qT/519AFVDTIWgV4FaJipsgHdYFTVnxkJHAiixTKAqEJ2SF1RJ2/pIH2hX5p2GNWhrXuOmnqiOZEByPSsqidSNS8aMCfIzt7UZ6XvIPhagZnEQ7NCA1BOuOqzWISIEKjSqA3MvfZ5kniis5J9cbTqkGB+pgW75fuQIxtmK7iCZbwuXOO735PzkKgeT/vfg4fTlbmOeikSNO6QaamGRZ+NJfprCIx5j5GKc970k6V9d4RcQltHojgWI7Wl2VRLsprm7Xy2keaTGXfjnCDwQ2cQRUgBqIoWyDoUzNqvDYXrEAfM19sNEICMx90fXaJeGrNbMg2jjWuyPacSnB0moDtECt4zd2svozGEWnVvdY8KDAWgMbTUlrufNOzh7hyrDMpaBSmSN9npyTpekM0kWlykfU++oEexXMi41b0cZLJc9ocPJCeKZ0fzpachHW35zsUh2E6OCgbXdDxNugVrG4ecz9nUqjJGyYhCX6mhz9VxpB46wEPQ/E2rTsnIfd+xMYoyLqLzCfKf/Z8CL8/Ifq7uDRxczRmo5sCrjByOdwyUGY+JoFQMc5OcEzfyepVmcwfuhuASBGAZOr1zM1ituqG614d7W+GDRHwCeAS8zUZKFdYvL5C4nOg+OxojqnC8zSGwN3ZcnMXHvvzKdQHw==
- name: [email protected]
username: martinbrocker
state: present
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCun3EuZ1sAP8/Drg3GkcNrIAMvoYQUXO2x1fMCAyLadMOvs9avpaKXnBrj5v5AxkGcHb3klLWwFOwJRKZMA4Y0wcWlF1B5DWLYHCwvkVKp/021pHS9YLYVST4rEDCuJnhnzKGEWiQpsCFGrLyW5Y5PWEV/XHW1otg4MnDaJvBy77gVxNjpITau7AGXMKRJ7kDvQm0D7AvydGJgH5iR3LLubiwnfQ7dH95XIbhGVsOphIaLO/QxvaPgCYkd34fYirRejbUuIYE/qCEhIvQQPjH+Q4CHDhnBUT3WybEXBQlczJ2UnWhSCrDJvlA34i7R+G45Pl3TlGWilw0jNVN/NYK23W45ZR3hB1KGfN69fN5/XgfWKTFn9wqeaK1ioH8uTIgZhpwumlZlMiD+smz8p6g+GNTb84WqgsBWDmEBtzJV/COiIS37+ud2orGIpPEzSxpWz23YMdFAzQT9f3VbFTNkzb7zkm7qPGD2avoG8B4tg9gbK7sWJWOKkC+zjCq+AXc=
- name: [email protected]
username: derrickrono
state: present
key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDNh4PK3dE8ZOEbD+CZSisHl8R0r7aAcFL48tW10Kv+EcuTlAH3Du6bHh2OrGgU9XC933WDbyUcB0N+T+wv9XJudVWE6708JoSflbW93nCiOojq+GkpbiCXHkTwvbV2MLtKOUCQQFD65umZ5/p568vpay6bWUfsFso/PjJ1zIktW9EYuK83mGU0C+F74nDZfmwc3CB1N8u6fgviFANfPZvE//If09MU6jMaSGc5umX2tIfH0n/OEal3jNsJgXu+5irUupJ56I39d4Zym+4DbaShsoXUz9PMvnlXd194aswJlEwlxcW4/lmq3IbW62kvMFf3UePTK6O4piE1Ci2XHlxnEUOzIz5FAnktd9FtDsGxynAVlvdLA93TJXwQ6FGtTQAuIWGXukOWwT11IATj+CSuhOOvsa/VAG2NZKsxlCex3F6V0FKmPir7OZXzLXkEMaW8UgKpGqZ6oaRY1pGOWIzuqyqP50Fakc+X+tV8QzKJN8TQu1A/RSvVX0DKOAYTC0M=

firewall_subnet_restriction: "10.1.10.0/16"

Expand Down
2 changes: 1 addition & 1 deletion reverse-proxy-nginx/package-conf-insecure/http-jempi-insecure.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ server {

location / {
resolver 127.0.0.11 valid=30s;
set $upstream_jempi_api jempi-api;
set $upstream_jempi_api jempi-api-kc;
proxy_pass http://$upstream_jempi_api:50000;
}
}
2 changes: 1 addition & 1 deletion reverse-proxy-nginx/package-conf-secure/http-jempi-secure.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ server {

location / {
resolver 127.0.0.11 valid=30s;
set $upstream_jempi_api jempi-api;
set $upstream_jempi_api jempi-api-kc;
proxy_pass http://$upstream_jempi_api:50000;
}
}
4 changes: 1 addition & 3 deletions test/cucumber/features/cluster-mode/openhim-packages.cluster.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ Feature: Openhim and its dependent packages?
| reverse-proxy_public | keycloak_public | openhim_public | openhim_default |
And The service "openhim-console" should be started with 3 replicas
And The service "openhim-console" should be connected to the networks
| reverse-proxy_public | keycloak_public | openhim_public | openhim_default |
And The service "interoperability-layer-openhim-config-importer" should be removed
And There should be 5 services
| reverse-proxy_public | keycloak_public | openhim_public | openhim_default |

Scenario: Destroy Openhim and its dependent packages
Given I use parameters "package destroy -n=interoperability-layer-openhim --dev --env-file=.env.cluster"
Expand Down
Loading