diff --git a/.flake8 b/.flake8 deleted file mode 100644 index 7da1f96..0000000 --- a/.flake8 +++ /dev/null @@ -1,2 +0,0 @@ -[flake8] -max-line-length = 100 diff --git a/.gitignore b/.gitignore index e325e14..59395c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -**/__pycache__/** fact_cache/** -.coverage vault.yml diff --git a/ci-requirements.txt b/ci-requirements.txt deleted file mode 100644 index 2441f1b..0000000 --- a/ci-requirements.txt +++ /dev/null @@ -1,6 +0,0 @@ -ansible -ansible-lint -pytest -pytest-cov -flake8 -yamllint diff --git a/plays/services/roles/include/vars/group.yml b/plays/services/roles/include/vars/group.yml new file mode 100644 index 0000000..c424d7f --- /dev/null +++ b/plays/services/roles/include/vars/group.yml @@ -0,0 +1,9 @@ +services_all_services: "{{ + services_all_hosts | map('extract', hostvars, 'services_host_services') | map('dict2items') | + flatten | items2dict }}" +services_rproxy_add_hosts: "\ + {% set add_host_list = [] %}\ + {% for service in ( services_all_services | dict2items ) %}\ + {{ add_host_list.append('--add-host-' ~ service.key ~ ':' ~ service.value.address) }}\ + {% endfor %}\ + {{ add_host_list | join(' ') }}" diff --git a/plugins/filter/format.py b/plugins/filter/format.py deleted file mode 100644 index 9f811d2..0000000 --- a/plugins/filter/format.py +++ /dev/null @@ -1,32 +0,0 @@ -import jinja2.exceptions -import ansible.errors -import ansible.module_utils - - -def __format_dict(dict_, pattern, *args): - values = [] - for arg in args: - keys = arg.split(".") - value = dict_ - for i, key in enumerate(keys): - try: - value = value[key] - except KeyError: - raise KeyError(f"{key} not in {'.'.join(['item'] + keys[:i])}") - values.append(value) - return pattern.format(*values) - - -def format_dict(dict_, pattern, *args): # pragma: no cover - try: - return __format_dict(dict_, pattern, *args) - except jinja2.exceptions.UndefinedError as e: - raise ansible.errors.AnsibleUndefinedVariable( - ansible.module_utils._text.to_native(e)) from e - except Exception as e: - raise ansible.errors.AnsibleFilterError(ansible.module_utils._text.to_native(e)) from e - - -class FilterModule: # pragma: no cover - def filters(self): - return {"format_dict": format_dict} diff --git a/plugins/tests/test_filter.py b/plugins/tests/test_filter.py deleted file mode 100644 index 28f30df..0000000 --- a/plugins/tests/test_filter.py +++ /dev/null @@ -1,43 +0,0 @@ -import ansible.errors -import pytest - -from plugins.filter.format import format_dict - - -@pytest.fixture() -def item(): - return { - "key": "key_value", - "value": { - "key_2_1": "value_2_1", - "key_2_2": { - "key_2_2_1": "value_2_2_1", - "key_2_2_2": "value_2_2_2", - }, - "key_2_3": { - "key_2_3_1": "value_2_3_1", - }, - }, - } - - -def test_format_dict(item): - string = format_dict( - item, - "start-{}-{}-{}-end", - "key", - "value.key_2_1", - "value.key_2_2.key_2_2_2", - ) - assert string == "start-key_value-value_2_1-value_2_2_2-end" - - -def test_format_dict_key_error(item): - with pytest.raises(ansible.errors.AnsibleFilterError): - format_dict( - item, - "start-{}-{}-{}-end", - "key", - "value.key_2_1", - "value.key_2_2.key_2_3_1", - )