diff --git a/etcd/defaults/main.yml b/etcd/defaults/main.yml index 64964883..402a194f 100644 --- a/etcd/defaults/main.yml +++ b/etcd/defaults/main.yml @@ -1,7 +1,6 @@ --- # Define variable for etcd -patroni_install_dependencies: "True" etcd_listen_ip: [] etcd_cluster_ips: [] etcd_client_port: "2379" @@ -10,3 +9,4 @@ etcd_local_name : "" etcd_cluster_token : "" etcd_datadir : "/var/lib/etcd/{{ etcd_cluster_token }}" etcd_initial_cluster: "" +etcd_install_dependencies_for_patroni: False diff --git a/etcd/handlers/main.yml b/etcd/handlers/main.yml new file mode 100644 index 00000000..f453e93f --- /dev/null +++ b/etcd/handlers/main.yml @@ -0,0 +1,6 @@ +--- + +- name: restart etcd + ansible.builtin.systemd: + name: etcd + state: restarted diff --git a/etcd/tasks/config.yml b/etcd/tasks/config.yml index 9a8e4a7a..a514915e 100644 --- a/etcd/tasks/config.yml +++ b/etcd/tasks/config.yml @@ -1,14 +1,6 @@ --- -- name: Create etcd config file - ansible.builtin.template: - src: etcd.j2 - dest: /etc/default/etcd - owner: root - group: root - mode: "0644" - -- name: Create etcd datadir +- name: etcd datadir is present ansible.builtin.file: name: "/var/lib/etcd/{{ etcd_cluster_token }}" state: directory @@ -16,4 +8,13 @@ group: etcd mode: "0700" +- name: etcd config file is present + ansible.builtin.template: + src: etcd.j2 + dest: /etc/default/etcd + owner: root + group: root + mode: "0644" + notify: restart etcd + diff --git a/etcd/tasks/packages.yml b/etcd/tasks/packages.yml index e6552ac9..6b50e442 100644 --- a/etcd/tasks/packages.yml +++ b/etcd/tasks/packages.yml @@ -5,11 +5,4 @@ name: - etcd-client - etcd-server - update_cache: yes - -- name: Install python dependencies for Patroni - ansible.builtin.apt: - name: - - python3-etcd - - python3-psycopg2 - when: patroni_install_dependencies | bool + update_cache: yes \ No newline at end of file diff --git a/etcd/templates/etcd.j2 b/etcd/templates/etcd.j2 index f6d886f8..1dc15824 100644 --- a/etcd/templates/etcd.j2 +++ b/etcd/templates/etcd.j2 @@ -4,7 +4,7 @@ ETCD_LOG_OUTPUTS="stdout" ETCD_LISTEN_PEER_URLS="http://{{ etcd_listen_ip }}:{{ etcd_peer_port }}" ETCD_LISTEN_CLIENT_URLS="http://localhost:{{ etcd_client_port }},http://{{ etcd_listen_ip }}:{{ etcd_client_port }}" ETCD_INITIAL_ADVERTISE_PEER_URLS="http://{{ etcd_listen_ip }}:{{ etcd_peer_port }}" -ETCD_INITIAL_CLUSTER="{{ etcd_initial_cluster }}," +ETCD_INITIAL_CLUSTER="{{ etcd_initial_cluster }}" ETCD_ADVERTISE_CLIENT_URLS="http://{{ etcd_listen_ip }}:{{ etcd_client_port }}" ETCD_INITIAL_CLUSTER_TOKEN="{{ etcd_cluster_token }}" ETCD_INITIAL_CLUSTER_STATE="new"