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

Parameters for patroni etcd username, password and namespace #473

Merged
merged 10 commits into from
Sep 26, 2023
Merged

Parameters for patroni etcd username, password and namespace #473

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f5374de
Parameters for patroni etcd username, password and namespace
lavr Sep 23, 2023
8336686
Update roles/patroni/templates/patroni.yml.j2
lavr Sep 25, 2023
1e90c5a
Update vars/main.yml
lavr Sep 25, 2023
89fd493
Apply suggestions from code review
vitabaks Sep 25, 2023
5084aac
confd config with etcd user, password and protocol
lavr Sep 25, 2023
eb41d4e
vip-manager config with etcd user, password and protocol
lavr Sep 25, 2023
089af11
patroni.yml.j2 fix
lavr Sep 25, 2023
470fa0b
Apply suggestions from code review
vitabaks Sep 25, 2023
14b54ce
vip-manager and confd template fix
lavr Sep 25, 2023
d66e209
Apply suggestions from code review
lavr Sep 26, 2023
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
11 changes: 10 additions & 1 deletion roles/patroni/templates/patroni.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

scope: {{ patroni_cluster_name }}
name: {{ ansible_hostname }}
namespace: /service/
namespace: {{ patroni_etcd_namespace | default("/service/") }}

{% if patroni_log_destination == 'logfile' %}
log:
Expand Down Expand Up @@ -36,6 +36,15 @@ etcd3:
{% if dcs_exists|bool and dcs_type == 'etcd' %}
etcd3:
hosts: {% for etcd_hosts in patroni_etcd_hosts %}{{etcd_hosts.host}}:{{etcd_hosts.port}}{% if not loop.last %},{% endif %}{% endfor %}
{% if patroni_etcd_username | default("") | length > 0 %}
username: {{ patroni_etcd_username | default("") }}
{% endif %}
{% if patroni_etcd_password | default("") | length > 0 %}
password: {{ patroni_etcd_password }}
{% endif %}
{% if patroni_etcd_protocol | default("") | length > 0 %}
lavr marked this conversation as resolved.
Show resolved Hide resolved
protocol: {{ patroni_etcd_protocol }}
{% endif %}
{% endif %}

{% if dcs_type == 'consul' %}
Expand Down
4 changes: 4 additions & 0 deletions vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@
# - { host: "10.128.64.140", port: "2379" }
# - { host: "10.128.64.142", port: "2379" }
# - { host: "10.128.64.143", port: "2379" }
patroni_etcd_namespace: "/service/" # (optional) etcd namespace for patroni cluster
patroni_etcd_username: "" # (optional) username for etcd authentication

Check failure on line 69 in vars/main.yml

View workflow job for this annotation

GitHub Actions / build

yaml[colons] 

Too many spaces after colon

Check failure on line 69 in vars/main.yml

View workflow job for this annotation

GitHub Actions / build 

69:24 [colons] too many spaces after colon
vitabaks marked this conversation as resolved.
Show resolved Hide resolved
patroni_etcd_password: "" # (optional) password for etcd authentication

Check failure on line 70 in vars/main.yml

View workflow job for this annotation

GitHub Actions / build

yaml[colons] 

Too many spaces after colon

Check failure on line 70 in vars/main.yml

View workflow job for this annotation

GitHub Actions / build 

70:24 [colons] too many spaces after colon
vitabaks marked this conversation as resolved.
Show resolved Hide resolved
patroni_etcd_protocol: "" # (optional) http or https, if not specified http is used

Check failure on line 71 in vars/main.yml

View workflow job for this annotation

GitHub Actions / build

yaml[colons] 

Too many spaces after colon

Check failure on line 71 in vars/main.yml

View workflow job for this annotation

GitHub Actions / build 

71:24 [colons] too many spaces after colon
vitabaks marked this conversation as resolved.
Show resolved Hide resolved

# more options you can specify in the roles/patroni/templates/patroni.yml.j2
# https://patroni.readthedocs.io/en/latest/SETTINGS.html#etcd
Expand Down
Loading