diff --git a/.ansible-lint b/.ansible-lint index ad5d6f4..ee5b727 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -1,3 +1,4 @@ +--- # .ansible-lint exclude_paths: - .github/ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc1ed20..d06bc6c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,12 @@ jobs: python -m pip install --upgrade pip pip install yamllint ansible-core ansible-lint - - name: Run linter + - name: Run yamllint + run: | + yamllint . + working-directory: ${{ env.collection_dir }} + + - name: Run ansible-lint run: | ansible-lint --version ansible-lint -v diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 1b53bcb..48d8e86 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -92,7 +92,6 @@ jobs: - name: Install kubevirt.core collection id: install if: inputs.ansible_test_targets != '' - # yamllint disable-line rule:line-length uses: ansible-network/github_actions/.github/actions/build_install_collection@main with: install_python_dependencies: true @@ -124,7 +123,6 @@ jobs: - name: Run integration tests if: inputs.ansible_test_targets != '' - # yamllint disable-line rule:line-length uses: ansible-network/github_actions/.github/actions/ansible_test_integration@main with: collection_path: ${{ steps.install.outputs.collection_path }} diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..7f74f9b --- /dev/null +++ b/.yamllint @@ -0,0 +1,6 @@ +--- +extends: default + +rules: + line-length: + max: 140 diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index b500cc6..5d83712 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -1,3 +1,4 @@ +--- ancestor: 1.0.0 releases: 1.0.0: diff --git a/changelogs/config.yaml b/changelogs/config.yaml index d8e3e16..1c0e6f5 100644 --- a/changelogs/config.yaml +++ b/changelogs/config.yaml @@ -1,3 +1,4 @@ +--- changelog_filename_template: ../CHANGELOG.rst changelog_filename_version_depth: 0 changes_file: changelog.yaml diff --git a/examples/inventory.kubevirt.yml b/examples/inventory.kubevirt.yml index d2b88e2..eb9480c 100644 --- a/examples/inventory.kubevirt.yml +++ b/examples/inventory.kubevirt.yml @@ -1,3 +1,4 @@ +--- plugin: kubevirt.core.kubevirt connections: - namespaces: diff --git a/examples/kubesecondarydns.kubevirt.yml b/examples/kubesecondarydns.kubevirt.yml index 2bd4211..04b77d2 100644 --- a/examples/kubesecondarydns.kubevirt.yml +++ b/examples/kubesecondarydns.kubevirt.yml @@ -1,3 +1,4 @@ +--- plugin: kubevirt.core.kubevirt connections: - namespaces: diff --git a/examples/play-create-dv.yml b/examples/play-create-dv.yml index 9b1bb22..f1559ae 100644 --- a/examples/play-create-dv.yml +++ b/examples/play-create-dv.yml @@ -1,3 +1,4 @@ +--- - name: Playbook creating a virtual machine with data volume hosts: localhost tasks: diff --git a/examples/play-create-min.yml b/examples/play-create-min.yml index 8ab42e7..73c95b7 100644 --- a/examples/play-create-min.yml +++ b/examples/play-create-min.yml @@ -1,3 +1,4 @@ +--- - name: Playbook instantiating a virtual machine hosts: localhost tasks: diff --git a/examples/play-create.yml b/examples/play-create.yml index de11dbb..575f243 100644 --- a/examples/play-create.yml +++ b/examples/play-create.yml @@ -1,3 +1,4 @@ +--- - name: Playbook creating a virtual machine with multus network hosts: localhost tasks: diff --git a/examples/play-delete-dv.yml b/examples/play-delete-dv.yml index 206d590..a66f163 100644 --- a/examples/play-delete-dv.yml +++ b/examples/play-delete-dv.yml @@ -1,3 +1,4 @@ +--- - name: Playbook terminating a virtual machine with data volume hosts: localhost tasks: diff --git a/examples/play-delete.yml b/examples/play-delete.yml index 6488c7e..14a76e0 100644 --- a/examples/play-delete.yml +++ b/examples/play-delete.yml @@ -1,3 +1,4 @@ +--- - name: Playbook terminating a virtual machine hosts: localhost tasks: diff --git a/examples/play-info-list.yml b/examples/play-info-list.yml index 0655a33..29c1308 100644 --- a/examples/play-info-list.yml +++ b/examples/play-info-list.yml @@ -1,3 +1,4 @@ +--- - name: Playbook describing a virtual machine hosts: localhost tasks: diff --git a/examples/play-info.yml b/examples/play-info.yml index 57628fd..a372af5 100644 --- a/examples/play-info.yml +++ b/examples/play-info.yml @@ -1,3 +1,4 @@ +--- - name: Playbook describing a virtual machine hosts: localhost tasks: diff --git a/examples/services.kubevirt.yml b/examples/services.kubevirt.yml index 23dde81..253631f 100644 --- a/examples/services.kubevirt.yml +++ b/examples/services.kubevirt.yml @@ -1,3 +1,4 @@ +--- plugin: kubevirt.core.kubevirt connections: - namespaces: diff --git a/galaxy.yml b/galaxy.yml index c465f47..670fe70 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -1,3 +1,4 @@ +--- namespace: kubevirt name: core version: "1.1.0" diff --git a/plugins/inventory/kubevirt.py b/plugins/inventory/kubevirt.py index 2942c73..45d356d 100644 --- a/plugins/inventory/kubevirt.py +++ b/plugins/inventory/kubevirt.py @@ -138,7 +138,7 @@ EXAMPLES = """ api_key: xxxxxxxxxxxxxxxx validate_certs: false -- name: Use default ~/.kube/config and return VirtualMachineInstances from namespace testing with interfaces connected to network bridge-network +- name: Use default ~/.kube/config and return VirtualMachineInstances from namespace testing connected to network bridge-network plugin: kubevirt.core.kubevirt connections: - namespaces: diff --git a/requirements.yml b/requirements.yml index 89ff613..cbcf2e9 100644 --- a/requirements.yml +++ b/requirements.yml @@ -1,3 +1,4 @@ +--- collections: - name: kubernetes.core version: '>=2.0.0' diff --git a/tests/config.yaml b/tests/config.yaml index d44d25d..9b322ad 100644 --- a/tests/config.yaml +++ b/tests/config.yaml @@ -1,2 +1,3 @@ +--- modules: python_requires: ">=3.11.0,<3.12.0" diff --git a/tests/integration/targets/inventory_kubevirt/playbook.yml b/tests/integration/targets/inventory_kubevirt/playbook.yml index 0f5b97a..49e6ad1 100644 --- a/tests/integration/targets/inventory_kubevirt/playbook.yml +++ b/tests/integration/targets/inventory_kubevirt/playbook.yml @@ -1,3 +1,4 @@ +--- - name: Create VM connection: local gather_facts: false diff --git a/tests/integration/targets/inventory_kubevirt/test.kubevirt.yml b/tests/integration/targets/inventory_kubevirt/test.kubevirt.yml index 57848ab..94d8014 100644 --- a/tests/integration/targets/inventory_kubevirt/test.kubevirt.yml +++ b/tests/integration/targets/inventory_kubevirt/test.kubevirt.yml @@ -1,3 +1,4 @@ +--- plugin: kubevirt.core.kubevirt connections: - namespaces: diff --git a/tests/integration/targets/inventory_kubevirt/test.label.kubevirt.yml b/tests/integration/targets/inventory_kubevirt/test.label.kubevirt.yml index 14419cc..3917365 100644 --- a/tests/integration/targets/inventory_kubevirt/test.label.kubevirt.yml +++ b/tests/integration/targets/inventory_kubevirt/test.label.kubevirt.yml @@ -1,3 +1,4 @@ +--- plugin: kubevirt.core.kubevirt connections: - namespaces: diff --git a/tests/integration/targets/inventory_kubevirt/test.net.kubevirt.yml b/tests/integration/targets/inventory_kubevirt/test.net.kubevirt.yml index 9eee3ab..a8591b2 100644 --- a/tests/integration/targets/inventory_kubevirt/test.net.kubevirt.yml +++ b/tests/integration/targets/inventory_kubevirt/test.net.kubevirt.yml @@ -1,3 +1,4 @@ +--- plugin: kubevirt.core.kubevirt connections: - namespaces: diff --git a/tests/integration/targets/kubevirt_vm/test.kubevirt.yml b/tests/integration/targets/kubevirt_vm/test.kubevirt.yml index 828b2fb..9d8c177 100644 --- a/tests/integration/targets/kubevirt_vm/test.kubevirt.yml +++ b/tests/integration/targets/kubevirt_vm/test.kubevirt.yml @@ -1,3 +1,4 @@ +--- plugin: kubevirt.core.kubevirt connections: - namespaces: