diff --git a/.ansible-lint.yml b/.ansible-lint.yml new file mode 100644 index 00000000..1bc5a52c --- /dev/null +++ b/.ansible-lint.yml @@ -0,0 +1,4 @@ +--- + +skip_list: + - var-naming[no-role-prefix] diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg index cb7ef5a4..541da7e3 100644 --- a/ansible/ansible.cfg +++ b/ansible/ansible.cfg @@ -4,5 +4,7 @@ error_on_undefined_vars = false timeout = 30 forks = 10 +roles_path = ../roles + [inventory] enable_plugins = yaml diff --git a/roles/ceph/templates/ceph.conf.j2 b/roles/ceph/templates/ceph.conf.j2 index 56dbb7f1..0c91f3f8 100644 --- a/roles/ceph/templates/ceph.conf.j2 +++ b/roles/ceph/templates/ceph.conf.j2 @@ -13,7 +13,7 @@ public_network = {{ ceph_network_public }} private_network = {{ ceph_network_private }} {% endif %} auth allow insecure global id reclaim = false -{% if ansible_default_ipv6['address'] | default("") %} +{% if ceph_ip_address | default(ansible_default_ipv6['address'] | default('')) | ansible.utils.ipv6 %} ms bind ipv6 = true ms bind ipv4 = false {% else %}