-
Notifications
You must be signed in to change notification settings - Fork 22
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.
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
Add small MariaDB docker role, for running on a single node #459
Conversation
f92e65d
to
4d17265
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
de defaults zijn niet helemaal consistent (op een paar plaatsen is het een dict geworden ipv een list van dicts)>
En er lijken een paar unrelated changes in te zitten. Zijn die expres?
- name: Create and start the server container | ||
community.docker.docker_container: | ||
name: aaserver | ||
image: ghcr.io/openconext/openconext-attribute-aggregation/aa-server:{{ attribute_aggregation_server_version }} | ||
pull: true | ||
restart_policy: "always" | ||
state: started | ||
networks: | ||
- name: "loadbalancer" | ||
networks: "{{ aa_docker_networks }}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Je vervangt hierdoor de list door een hash. Moet de default niet zijn:
aa_docker_networks:
- name: loadbalancer
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Klopt. Het aardige is dat het wel gewoon werkt, alles op TEST is met deze branch gedeployed :)
roles/engineblock/defaults/main.yml
Outdated
@@ -107,3 +107,5 @@ engine_site_notice_show: false | |||
engineblock_log_attributes: [] | |||
|
|||
engine_php_memory: 256M | |||
engine_docker_networks: | |||
name: loadbalancer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
idem
@@ -15,3 +15,5 @@ invite_manage_provision_oauth_rs_scopes: "openid" | |||
invite_mock_install: false | |||
# Override is in the dockerX.env host_var files | |||
invite_cronjobmaster: true | |||
invite_docker_networks: | |||
- name: loadbalancer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hier gaat het wel goed ;)
@@ -20,7 +20,7 @@ parameters: | |||
password: "{{ teams_api_lifecycle_password }}" | |||
verify_ssl: true | |||
invite: | |||
url: 'https://invite.{{ base_domain }}/api/' | |||
url: 'https://invite.{{ base_domain }}/api/external/v1/' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dit lijtk een ongerelateerde change. Is dat bewust?
roles/manage/defaults/main.yml
Outdated
@@ -30,3 +30,5 @@ manage_tabs_enabled: | |||
- single_tenant_template | |||
- provisioning | |||
- sram | |||
manage_docker_networks: | |||
name: loadbalancer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
en weer mis :)
@@ -0,0 +1,2 @@ | |||
gateway_docker_networks: | |||
name: loadbalancer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dit moet weer een list zijn
@@ -0,0 +1,2 @@ | |||
middelware_docker_networks: | |||
name: loadbalancer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
en deze ook
|
||
- name: Include vm tasks when running on a vm | ||
include_tasks: vm.yml | ||
when: "'docker' not in group_names" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
per abuis gecommit?
roles/stepuptiqr/defaults/main.yml
Outdated
@@ -0,0 +1,2 @@ | |||
tiqr_docker_networks: | |||
name: loadbalancer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
moet weer een list zijn
@@ -0,0 +1,2 @@ | |||
webauthn_docker_networks: | |||
name: loadbalancer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
moet list zijn
internal Docker network to connect to a local MariaDB host in Docker
4d17265
to
ec01572
Compare
All network definitions in the defaults are lists now, merging! |
The role mariadbdocker is added, which provisions a MariaDB docker container on the Docker host. It allows for hosting all MariaDB databases.
A docker network is created, and all roles that require MariaDB access have access to this network