Merge branch 'master' into fix-readme-typo

Author: mnasiadka

.github/workflows/test.yml

@@ -56,9 +56,9 @@ jobs:
       - name: Run ansible-test units
         working-directory: ansible_collections/stackhpc/cephadm
         run: |
-          ansible-test units --verbose --docker --coverage
-          ansible-test coverage xml
-          ansible-test coverage html
+          ansible-test units --verbose --docker --coverage --requirements
+          ansible-test coverage xml --requirements
+          ansible-test coverage html --requirements
 
       - name: Print coverage report
         working-directory: ansible_collections/stackhpc/cephadm

roles/cephadm/templates/cluster.yml.j2

@@ -59,8 +59,7 @@ networks:
 {% endif %}
 {% endif %}
 {% if service.spec is defined %}
-spec:
-  {{ service.spec | to_nice_yaml }}
+{{ {"spec": service.spec} | to_nice_yaml(indent=2) }}
 {% endif %}
 {% endfor %}
 {% endif %}
@@ -72,6 +71,6 @@ service_id: {{ service.id }}
 placement:
   label: ingress
 spec:
-  {{ service.spec | to_nice_yaml }}
+{{ {"spec": service.spec} | to_nice_yaml(indent=2) }}
 {% endfor %}
 {% endif %}

test-requirements.txt

@@ -1,7 +1,6 @@
 ansible>=2.9
 ansible-lint<7
 antsibull-changelog
-coverage<=6.5.0
 mock
 pytest
 pytest-forked

tests/sanity/ignore-2.16.txt

@@ -0,0 +1,13 @@
+plugins/modules/cephadm_pool.py pylint:disallowed-name
+plugins/modules/cephadm_crush_rule.py validate-modules:missing-gplv3-license
+plugins/modules/cephadm_crush_rule.py validate-modules:parameter-state-invalid-choice
+plugins/modules/cephadm_crush_rule.py validate-modules:invalid-documentation
+plugins/modules/cephadm_ec_profile.py validate-modules:invalid-documentation
+plugins/modules/cephadm_ec_profile.py validate-modules:missing-gplv3-license
+plugins/modules/cephadm_key.py validate-modules:invalid-documentation
+plugins/modules/cephadm_key.py validate-modules:missing-gplv3-license
+plugins/modules/cephadm_key.py validate-modules:parameter-state-invalid-choice
+plugins/modules/cephadm_pool.py validate-modules:missing-gplv3-license
+plugins/modules/cephadm_pool.py validate-modules:parameter-state-invalid-choice
+plugins/modules/cephadm_pool.py validate-modules:invalid-documentation
+plugins/modules/cephadm_pool.py validate-modules:doc-default-does-not-match-spec