Skip to content

Commit 372e4e2

Browse files
committed
Update foreman database SSL params to match the other roles
Renames foreman_database_sslrootcert to foreman_database_ssl_ca and foreman_database_sslmode to foreman_database_ssl_mode
1 parent 18aab3f commit 372e4e2

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/roles/check_database_connection/tasks/main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
user: "{{ foreman_database_user }}"
99
password: "{{ foreman_database_password }}"
1010
dbname: "{{ foreman_database_name }}"
11-
ca_cert: "{{ foreman_database_sslrootcert | default(omit) }}"
12-
sslmode: "{{ foreman_database_sslmode | default(omit) }}"
11+
ca_cert: "{{ foreman_database_ssl_ca | default(omit) }}"
12+
sslmode: "{{ foreman_database_ssl_mode | default(omit) }}"
1313

1414
- name: Candlepin
1515
host: "{{ candlepin_database_host }}"

src/roles/foreman/defaults/main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ foreman_database_user: foreman
77
foreman_database_host: localhost
88
foreman_database_port: 5432
99
foreman_database_pool: 9
10-
foreman_database_sslmode: disable
11-
foreman_database_sslrootcert:
10+
foreman_database_ssl_mode: disable
11+
foreman_database_ssl_ca:
1212

1313
foreman_url: "http://{{ ansible_facts['fqdn'] }}:3000"
1414

src/roles/foreman/tasks/main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
containers.podman.podman_secret:
99
state: present
1010
name: foreman-database-url
11-
data: "postgresql://{{ foreman_database_user }}:{{ foreman_database_password }}@{{ foreman_database_host }}:{{ foreman_database_port }}/{{ foreman_database_name }}?pool={{ foreman_database_pool }}&sslmode={{ foreman_database_sslmode }}{% if foreman_database_sslrootcert is defined %}&sslrootcert=/etc/foreman/db-ca.crt{% endif %}" # yamllint disable-line rule:line-length
11+
data: "postgresql://{{ foreman_database_user }}:{{ foreman_database_password }}@{{ foreman_database_host }}:{{ foreman_database_port }}/{{ foreman_database_name }}?pool={{ foreman_database_pool }}&sslmode={{ foreman_database_ssl_mode }}{% if foreman_database_ssl_ca is defined %}&sslrootcert=/etc/foreman/db-ca.crt{% endif %}" # yamllint disable-line rule:line-length
1212
notify:
1313
- Restart foreman
1414
- Restart dynflow-sidekiq@
@@ -88,7 +88,7 @@
8888
containers.podman.podman_secret:
8989
state: present
9090
name: foreman-db-ca
91-
data: "{{ lookup('ansible.builtin.file', foreman_database_sslrootcert) if foreman_database_sslrootcert else 'empty' }}"
91+
data: "{{ lookup('ansible.builtin.file', foreman_database_ssl_ca) if foreman_database_ssl_ca else 'empty' }}"
9292
notify:
9393
- Restart foreman
9494
- Restart dynflow-sidekiq@

src/vars/database.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ pulp_database_ssl_ca: "{{ database_ssl_ca }}"
2626

2727
foreman_database_host: "{{ database_host }}"
2828
foreman_database_port: "{{ database_port }}"
29-
foreman_database_sslmode: "{{ database_ssl_mode }}"
30-
foreman_database_sslrootcert: "{{ database_ssl_ca }}"
29+
foreman_database_ssl_mode: "{{ database_ssl_mode }}"
30+
foreman_database_ssl_ca: "{{ database_ssl_ca }}"
3131

3232
postgresql_databases:
3333
- name: "{{ candlepin_database_name }}"

0 commit comments

Comments
 (0)