15.0.0+3.5.26 (#46)

* increase min_ansible_version to 2.10 in meta/main.yml

* replace injected ansible_* facts usage with ansible_facts[...] (prepares for ansible-core 2.24 where INJECT_FACTS_AS_VARS default changes)

* update CHANGELOG/README

Author: githubixx

CHANGELOG.md

@@ -5,6 +5,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
 # Changelog
 
+## 15.0.0+3.5.26
+
+- increase `min_ansible_version` to `2.10` in `meta/main.yml`
+- replace injected `ansible_*` facts usage with `ansible_facts[...]` (prepares for ansible-core 2.24 where INJECT_FACTS_AS_VARS default changes)
+- allow specifying external IPs for etcd peer/client URLs when not available via Ansible facts - see [#44](https://github.com/githubixx/ansible-role-etcd/pull/44) (contribution by @pavlozt)
+
 ## 14.0.4+3.5.26
 
 **NOTE**: If you use `etcd` for Kubernetes and want to upgrade to `etcd` `v3.6` you **DEFINITELY** want to upgrade to `etcd` `v3.6.26` first! For further information:

README.md

@@ -14,7 +14,7 @@ Upgrading a etcd cluster which was installed by this role is described in [here]
 
 ## Versions
 
-I tag every release and try to stay with [semantic versioning](http://semver.org). If you want to use the role I recommend to checkout the latest tag. The master branch is basically development while the tags mark stable releases. But in general I try to keep master in good shape too. A tag `14.0.4+3.5.26` means this is release `14.0.4` of this role and it's meant to be used with etcd version `3.5.26` (but should work with newer versions also). If the role itself changes `X.Y.Z` before `+` will increase. If the etcd version changes `X.Y.Z` after `+` will increase. This allows to tag bugfixes and new major versions of the role while it's still developed for a specific etcd release.
+I tag every release and try to stay with [semantic versioning](http://semver.org). If you want to use the role I recommend to checkout the latest tag. The master branch is basically development while the tags mark stable releases. But in general I try to keep master in good shape too. A tag `15.0.0+3.5.26` means this is release `15.0.0` of this role and it's meant to be used with etcd version `3.5.26` (but should work with newer versions also). If the role itself changes `X.Y.Z` before `+` will increase. If the etcd version changes `X.Y.Z` after `+` will increase. This allows to tag bugfixes and new major versions of the role while it's still developed for a specific etcd release.
 
 ## Changelog
 
@@ -40,7 +40,7 @@ This role requires that you already created some certificates for `etcd` (see [K
   roles:
     - name: githubixx.etcd
       src: https://github.com/githubixx/ansible-role-etcd.git
-      version: 14.0.4+3.5.26
+      version: 15.0.0+3.5.26
   ```
 
 ## Role Variables
@@ -214,17 +214,17 @@ etcd_service_options:
   - CapabilityBoundingSet=~CAP_SYS_PTRACE
 
 etcd_settings:
-  "name": "{{ ansible_hostname }}"
+  "name": "{{ ansible_facts['hostname'] }}"
   "cert-file": "{{ etcd_conf_dir }}/cert-etcd-server.pem"
   "key-file": "{{ etcd_conf_dir }}/cert-etcd-server-key.pem"
   "trusted-ca-file": "{{ etcd_conf_dir }}/ca-etcd.pem"
   "peer-cert-file": "{{ etcd_conf_dir }}/cert-etcd-peer.pem"
   "peer-key-file": "{{ etcd_conf_dir }}/cert-etcd-peer-key.pem"
   "peer-trusted-ca-file": "{{ etcd_conf_dir }}/ca-etcd.pem"
-  "advertise-client-urls": "{{ 'https://' + hostvars[inventory_hostname]['ansible_' + etcd_interface].ipv4.address + ':' + etcd_client_port }}"
-  "initial-advertise-peer-urls": "{{ 'https://' + hostvars[inventory_hostname]['ansible_' + etcd_interface].ipv4.address + ':' + etcd_peer_port }}"
-  "listen-peer-urls": "{{ 'https://' + hostvars[inventory_hostname]['ansible_' + etcd_interface].ipv4.address + ':' + etcd_peer_port }}"
-  "listen-client-urls": "{{ 'https://' + hostvars[inventory_hostname]['ansible_' + etcd_interface].ipv4.address + ':' + etcd_client_port + ',https://127.0.0.1:' + etcd_client_port }}"
+  "advertise-client-urls": "{{ 'https://' + ansible_facts[etcd_interface]['ipv4']['address'] + ':' + etcd_client_port }}"
+  "initial-advertise-peer-urls": "{{ 'https://' + ansible_facts[etcd_interface]['ipv4']['address'] + ':' + etcd_peer_port }}"
+  "listen-peer-urls": "{{ 'https://' + ansible_facts[etcd_interface]['ipv4']['address'] + ':' + etcd_peer_port }}"
+  "listen-client-urls": "{{ 'https://' + ansible_facts[etcd_interface]['ipv4']['address'] + ':' + etcd_client_port + ',https://127.0.0.1:' + etcd_client_port }}"
   "peer-client-cert-auth": "true"            # Enable peer client cert authentication
   "client-cert-auth": "true"                 # Enable client cert authentication
   "initial-cluster-token": "etcd-cluster-0"  # Initial cluster token for the etcd cluster during bootstrap.

defaults/main.yml

@@ -173,17 +173,17 @@ etcd_service_options:
   - CapabilityBoundingSet=~CAP_SYS_PTRACE
 
 etcd_settings:
-  "name": "{{ ansible_hostname }}"
+  "name": "{{ ansible_facts['hostname'] }}"
   "cert-file": "{{ etcd_conf_dir }}/cert-etcd-server.pem"
   "key-file": "{{ etcd_conf_dir }}/cert-etcd-server-key.pem"
   "trusted-ca-file": "{{ etcd_conf_dir }}/ca-etcd.pem"
   "peer-cert-file": "{{ etcd_conf_dir }}/cert-etcd-peer.pem"
   "peer-key-file": "{{ etcd_conf_dir }}/cert-etcd-peer-key.pem"
   "peer-trusted-ca-file": "{{ etcd_conf_dir }}/ca-etcd.pem"
-  "advertise-client-urls": "{{ 'https://' + hostvars[inventory_hostname]['ansible_' + etcd_interface].ipv4.address + ':' + etcd_client_port }}"
-  "initial-advertise-peer-urls": "{{ 'https://' + hostvars[inventory_hostname]['ansible_' + etcd_interface].ipv4.address + ':' + etcd_peer_port }}"
-  "listen-peer-urls": "{{ 'https://' + hostvars[inventory_hostname]['ansible_' + etcd_interface].ipv4.address + ':' + etcd_peer_port }}"
-  "listen-client-urls": "{{ 'https://' + hostvars[inventory_hostname]['ansible_' + etcd_interface].ipv4.address + ':' + etcd_client_port + ',https://127.0.0.1:' + etcd_client_port }}"
+  "advertise-client-urls": "{{ 'https://' + ansible_facts[etcd_interface]['ipv4']['address'] + ':' + etcd_client_port }}"
+  "initial-advertise-peer-urls": "{{ 'https://' + ansible_facts[etcd_interface]['ipv4']['address'] + ':' + etcd_peer_port }}"
+  "listen-peer-urls": "{{ 'https://' + ansible_facts[etcd_interface]['ipv4']['address'] + ':' + etcd_peer_port }}"
+  "listen-client-urls": "{{ 'https://' + ansible_facts[etcd_interface]['ipv4']['address'] + ':' + etcd_client_port + ',https://127.0.0.1:' + etcd_client_port }}"
   "peer-client-cert-auth": "true"            # Enable peer client cert authentication
   "client-cert-auth": "true"                 # Enable client cert authentication
   "initial-cluster-token": "etcd-cluster-0"  # Initial cluster token for the etcd cluster during bootstrap.

meta/main.yml

@@ -6,7 +6,7 @@ galaxy_info:
   author: Robert Wimmer
   description: Installs etcd cluster.
   license: GPLv3
-  min_ansible_version: "2.9"
+  min_ansible_version: "2.10"
   role_name: etcd
   namespace: githubixx
   platforms:

templates/etc/systemd/system/etcd.service.j2

@@ -5,7 +5,7 @@
 {%- if not etcd_settings.get('discovery-srv') and not etcd_settings.get('initial-cluster') %}
 {%- macro cluster_hosts() -%}
 {%- for host in groups[etcd_ansible_group] -%}
-{{ hostvars[host]['ansible_hostname'] }}=https://{{ hostvars[host]['ansible_' + etcd_interface].ipv4.address }}:{{ etcd_peer_port }}{% if not loop.last %},{% endif %}
+{{ hostvars[host]['ansible_facts']['hostname'] }}=https://{{ hostvars[host]['ansible_facts'][etcd_interface]['ipv4']['address'] }}:{{ etcd_peer_port }}{% if not loop.last %},{% endif %}
 {%- endfor -%}
 {%- endmacro -%}
 {%- set etcd_settings = etcd_settings | combine({'initial-cluster': cluster_hosts()}) -%}