Refactor Consul bootstrap variable handling

Removed redundant and manual settings of consul_bootstrap_expect in inventory, molecule, and playbooks. Now, consul_bootstrap_expect is automatically set based on consul_node_role in common defaults. Updated cloud_resources to set consul_node_role per host and adjusted datacenter assignment to use server_location. This simplifies Consul configuration and improves consistency.

Author: vitabaks

automation/inventory.example

@@ -16,9 +16,9 @@
 
 # if dcs_exists: false and dcs_type: "consul"
 [consul_instances]  # recommendation: 3 or 5-7 nodes
-#10.128.64.140 consul_node_role=server consul_bootstrap_expect=true consul_datacenter=dc1
-#10.128.64.142 consul_node_role=server consul_bootstrap_expect=true consul_datacenter=dc1
-#10.128.64.143 consul_node_role=server consul_bootstrap_expect=true consul_datacenter=dc1
+#10.128.64.140 consul_node_role=server consul_datacenter=dc1
+#10.128.64.142 consul_node_role=server consul_datacenter=dc1
+#10.128.64.143 consul_node_role=server consul_datacenter=dc1
 #10.128.64.144 consul_node_role=client consul_datacenter=dc2
 #10.128.64.145 consul_node_role=client consul_datacenter=dc2
 

automation/molecule/default/converge.yml

@@ -17,7 +17,6 @@
         dcs_type: "{{ 'etcd' if ansible_distribution_major_version in ['10'] or ansible_distribution_release in ['trixie']
           else (['etcd', 'consul'] | random) }}" # TODO: Consul support for RHEL 10, Debian 13
         consul_node_role: server # if dcs_type: "consul"
-        consul_bootstrap_expect: true # if dcs_type: "consul"
         postgresql_version: 18
         pgbouncer_processes: 2 # Test multiple pgbouncer processes (so_reuseport)
         patroni_tags: "datacenter=dc1,key1=value1"

automation/molecule/pg_upgrade/converge.yml

@@ -17,7 +17,6 @@
         dcs_type: "{{ 'etcd' if ansible_distribution_major_version in ['10'] or ansible_distribution_release in ['trixie']
           else (['etcd', 'consul'] | random) }}" # TODO: Consul support for RHEL 10, Debian 13
         consul_node_role: server # if dcs_type: "consul"
-        consul_bootstrap_expect: true # if dcs_type: "consul"
         postgresql_version: 17 # redefine the version to install for the upgrade test
         pgbouncer_processes: 4 # Test multiple pgbouncer processes (so_reuseport)
         cacheable: true

automation/playbooks/consul_cluster.yml

@@ -148,14 +148,6 @@
         consul_dnsmasq_servers: "{{ consul_dnsmasq_servers | reject('equalto', '127.0.0.1') | list }}"
       when: dcs_type | default('etcd') == "consul" and consul_dnsmasq_enable | default(true) | bool and ('127.0.0.1' in (consul_dnsmasq_servers | default([])))
 
-    # Setting variables for Consul during cloud deployment
-    - name: Redefine the consul_node_role and consul_bootstrap_expect variables
-      ansible.builtin.set_fact:
-        consul_node_role: "{{ 'server' if not dcs_exists | default(false) else 'client' }}"
-        consul_bootstrap_expect: "{{ not dcs_exists | default(false) }}"
-        consul_datacenter: "{{ server_location | default('dc1') }}"
-      when: cloud_provider | default('') | length > 0
-
   roles:
     - role: vitabaks.autobase.firewall
       vars:

automation/roles/cloud_resources/tasks/inventory.yml

@@ -78,6 +78,7 @@
   ansible.builtin.add_host:
     name: "{{ item.private_ip }}"
     group: consul_instances
+    consul_node_role: "{{ 'server' if not dcs_exists | default(false) else 'client' }}"
     ansible_ssh_host: "{{ item[server_public_ip | bool | ternary('public_ip', 'private_ip')] }}"
     ansible_ssh_private_key_file: "{{ ssh_private_key_file | default(None) }}"
     new_node: "{{ item.new_node | default(omit) }}"

automation/roles/common/defaults/main.yml

@@ -156,13 +156,14 @@ consul_config_path: "/etc/consul"
 consul_configd_path: "{{ consul_config_path }}/conf.d"
 consul_data_path: "/var/lib/consul"
 consul_domain: "consul" # Consul domain name
-consul_datacenter: "dc1" # Datacenter label (can be specified for each host in the inventory)
+consul_datacenter: "{{ server_location | default('dc1') }}" # Datacenter label (can be specified for each host in the inventory)
 consul_disable_update_check: true # Disables automatic checking for security bulletins and new version releases
 consul_enable_script_checks: true # This controls whether health checks that execute scripts are enabled on this agent
 consul_enable_local_script_checks: true # Enable them when they are defined in the local configuration files
 consul_ui: false # Enable the consul UI?
 consul_syslog_enable: true # Enable logging to syslog
 consul_client_address: "127.0.0.1" # Client address. Affects DNS, HTTP, HTTPS, and gRPC client interfaces.
+consul_bootstrap_expect: "{{ true if consul_node_role == 'server' else false }}"
 consul_on_dedicated_nodes: "{{ groups['consul_instances'] | difference(groups['postgres_cluster']) | length > 0 }}" # 'true' or 'false'
 # TLS
 # Enables TLS encryption with a self-signed certificate if 'tls_cert_generate' is true.

automation/roles/consul/defaults/main.yml

@@ -83,7 +83,7 @@ consul_alt_domain: "{{ lookup('env', 'CONSUL_ALT_DOMAIN') | default('', true) }}
 consul_node_meta: {}
 consul_node_role: "{{ lookup('env', 'CONSUL_NODE_ROLE') | default('client', true) }}"
 # consul_recursors: "{{ lookup('env', 'CONSUL_RECURSORS') | default('[]', true) }}"
-consul_bootstrap_expect: "{{ lookup('env', 'CONSUL_BOOTSTRAP_EXPECT') | default(false, true) }}"
+# consul_bootstrap_expect: "{{ lookup('env', 'CONSUL_BOOTSTRAP_EXPECT') | default(false, true) }}"
 consul_bootstrap_expect_value: "{{ _consul_lan_servercount | int }}"
 # consul_ui: "{{ lookup('env', 'CONSUL_UI') | default(true, true) }}"
 consul_ui_legacy: "{{ lookup('env', 'CONSUL_UI_LEGACY') | default(false, false) }}"