diff --git a/ansible/defaults/rqlite.yml b/ansible/defaults/rqlite.yml index d83658f..bf3e367 100644 --- a/ansible/defaults/rqlite.yml +++ b/ansible/defaults/rqlite.yml @@ -7,6 +7,13 @@ rqlite_data_dir: "/home/{{ ansible_user }}/data" rqlite_extract_dir: "/opt/rqlite" rqlite_download_url: "https://github.com/rqlite/rqlite/releases/download/v{{ rqlite_version }}/rqlite-v{{ rqlite_version }}-linux-amd64.tar.gz" +# Node configuration +rqlite_node_list: + - rqlite1 + - rqlite2 + - rqlite3 +rqlite_leader_node: rqlite1 + # Node resources node_cpus: 2 node_memory: 2G diff --git a/ansible/playbooks/rqlite.yml b/ansible/playbooks/rqlite.yml index ed8aec3..ce3d07b 100644 --- a/ansible/playbooks/rqlite.yml +++ b/ansible/playbooks/rqlite.yml @@ -1,22 +1,17 @@ --- # ansible/playbooks/rqlite.yml -#- name: Common configuration for all rqlite nodes -# hosts: rqlite_cluster -# become: yes -# vars_files: -# - ../defaults/rqlite.yml -# tags: -# - common -# tasks: -# - include_tasks: ../tasks/rqlite/setup-hosts.yml -# - include_tasks: ../tasks/rqlite/update-dns.yml -# - include_tasks: ../tasks/rqlite/ssh.yml - - name: Setup all rqlite nodes hosts: rqlite_cluster become: yes vars_files: - ../defaults/rqlite.yml + vars: + # Explicitly define the node list and leader + rqlite_node_list: + - rqlite1 + - rqlite2 + - rqlite3 + rqlite_leader_node: rqlite1 tags: - rqlite-setup tasks: @@ -27,6 +22,13 @@ become: yes vars_files: - ../defaults/rqlite.yml + vars: + node_id: 1 + rqlite_node_list: + - rqlite1 + - rqlite2 + - rqlite3 + rqlite_leader_node: rqlite1 tags: - leader tasks: @@ -37,6 +39,14 @@ become: yes vars_files: - ../defaults/rqlite.yml + vars: + # Dynamically calculate node ID for followers + node_id: "{{ rqlite_node_list.index(inventory_hostname) + 2 }}" + rqlite_node_list: + - rqlite1 + - rqlite2 + - rqlite3 + rqlite_leader_node: rqlite1 tags: - followers tasks: diff --git a/ansible/tasks/rqlite/follower-join.yml b/ansible/tasks/rqlite/follower-join.yml index ac4ea65..2722f00 100644 --- a/ansible/tasks/rqlite/follower-join.yml +++ b/ansible/tasks/rqlite/follower-join.yml @@ -13,7 +13,7 @@ User={{ ansible_user }} Group={{ ansible_user }} WorkingDirectory=/home/{{ ansible_user }} - ExecStart=/usr/local/bin/rqlited -node-id {{ groups['rqlite_nodes'].index(inventory_hostname) + 1 }} -http-addr {{ ansible_host }}:{{ rqlite_http_port }} -raft-addr {{ ansible_host }}:{{ rqlite_raft_port }} -join {{ hostvars[groups['rqlite_leader'][0]]['ansible_host'] }}:{{ rqlite_raft_port }} {{ rqlite_data_dir }} + ExecStart=/usr/local/bin/rqlited -node-id {{ node_id }} -http-addr {{ ansible_host }}:{{ rqlite_http_port }} -raft-addr {{ ansible_host }}:{{ rqlite_raft_port }} -join {{ hostvars[rqlite_leader_node]['ansible_host'] }}:{{ rqlite_raft_port }} {{ rqlite_data_dir }} Restart=on-failure RestartSec=5 @@ -25,7 +25,7 @@ rule: allow port: "{{ item }}" proto: tcp - with_items: + with_items: - "{{ rqlite_http_port }}" - "{{ rqlite_raft_port }}" when: ansible_os_family == "Debian" diff --git a/ansible/tasks/rqlite/validate-cluster.yml b/ansible/tasks/rqlite/validate-cluster.yml index b7a5e92..f294bb9 100644 --- a/ansible/tasks/rqlite/validate-cluster.yml +++ b/ansible/tasks/rqlite/validate-cluster.yml @@ -8,12 +8,13 @@ until: node_ready.status == 200 retries: 12 delay: 5 - with_items: "{{ groups['rqlite_nodes'] }}" + with_items: + - "{{ rqlite_node_list }}" delegate_to: localhost run_once: true - name: Check cluster status - shell: "curl -s http://{{ hostvars[groups['rqlite_leader'][0]]['ansible_host'] }}:{{ rqlite_http_port }}/nodes?pretty" + shell: "curl -s http://{{ hostvars[rqlite_leader_node]['ansible_host'] }}:{{ rqlite_http_port }}/nodes?pretty" register: cluster_status changed_when: false delegate_to: localhost @@ -27,7 +28,7 @@ - name: Verify node count debug: - msg: "Successfully configured {{ groups['rqlite_nodes'] | length }} rqlite nodes" + msg: "Successfully configured {{ rqlite_node_list | length }} rqlite nodes" delegate_to: localhost run_once: true @@ -35,8 +36,8 @@ debug: msg: - "rqlite cluster validation summary:" - - "Leader node: {{ hostvars[groups['rqlite_leader'][0]]['ansible_host'] }}" - - "Follower nodes: {{ groups['rqlite_followers'] | map('extract', hostvars, ['ansible_host']) | join(', ') }}" + - "Leader node: {{ hostvars[rqlite_leader_node]['ansible_host'] }}" + - "Follower nodes: {{ rqlite_node_list | difference([rqlite_leader_node]) | map('extract', hostvars, 'ansible_host') | list | join(', ') }}" - "HTTP API port: {{ rqlite_http_port }}" - "Raft consensus port: {{ rqlite_raft_port }}" delegate_to: localhost