From 6ab9f071c6ca4882d4b8ece93b5afc7d7ced40d8 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sun, 29 Mar 2020 13:02:28 +0200 Subject: [PATCH] Fix FQCRs. (#64) --- .../connection_docker/test_connection.inventory | 2 +- .../connection_jail/test_connection.inventory | 2 +- .../connection_libvirt_lxc/test_connection.inventory | 2 +- .../targets/connection_lxc/test_connection.inventory | 2 +- .../targets/connection_lxd/test_connection.inventory | 2 +- .../inventory_cloudscale/playbooks/cleanup.yml | 2 +- .../targets/inventory_cloudscale/playbooks/setup.yml | 12 ++++++------ .../inventory_docker_swarm/playbooks/swarm_setup.yml | 2 +- .../lookup_hashi_vault/tasks/approle_test.yml | 2 +- tests/integration/targets/lookup_lmdb_kv/test.yml | 6 +++--- .../targets/lookup_passwordstore/tasks/tests.yml | 4 ++-- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/integration/targets/connection_docker/test_connection.inventory b/tests/integration/targets/connection_docker/test_connection.inventory index 42940ac3b7..7cef1cbdf9 100644 --- a/tests/integration/targets/connection_docker/test_connection.inventory +++ b/tests/integration/targets/connection_docker/test_connection.inventory @@ -3,4 +3,4 @@ docker-pipelining ansible_ssh_pipelining=true docker-no-pipelining ansible_ssh_pipelining=false [docker:vars] ansible_host=ubuntu-latest -ansible_connection=docker +ansible_connection=community.general.docker diff --git a/tests/integration/targets/connection_jail/test_connection.inventory b/tests/integration/targets/connection_jail/test_connection.inventory index a525c72f43..466f7776eb 100644 --- a/tests/integration/targets/connection_jail/test_connection.inventory +++ b/tests/integration/targets/connection_jail/test_connection.inventory @@ -3,5 +3,5 @@ jail-pipelining ansible_ssh_pipelining=true jail-no-pipelining ansible_ssh_pipelining=false [jail:vars] ansible_host=freebsd_10_2 -ansible_connection=jail +ansible_connection=community.general.jail ansible_python_interpreter=/usr/local/bin/python diff --git a/tests/integration/targets/connection_libvirt_lxc/test_connection.inventory b/tests/integration/targets/connection_libvirt_lxc/test_connection.inventory index ff98a25542..560d16826d 100644 --- a/tests/integration/targets/connection_libvirt_lxc/test_connection.inventory +++ b/tests/integration/targets/connection_libvirt_lxc/test_connection.inventory @@ -3,4 +3,4 @@ libvirt_lxc-pipelining ansible_ssh_pipelining=true libvirt_lxc-no-pipelining ansible_ssh_pipelining=false [libvirt_lxc:vars] ansible_host=lv-ubuntu-wily-amd64 -ansible_connection=libvirt_lxc +ansible_connection=community.general.libvirt_lxc diff --git a/tests/integration/targets/connection_lxc/test_connection.inventory b/tests/integration/targets/connection_lxc/test_connection.inventory index 8737a9e8f9..5e3e3c3f40 100644 --- a/tests/integration/targets/connection_lxc/test_connection.inventory +++ b/tests/integration/targets/connection_lxc/test_connection.inventory @@ -14,4 +14,4 @@ lxc-no-pipelining ansible_ssh_pipelining=false # 6. stop container # $ sudo lxc-stop -n centos-7-amd64 ansible_host=centos-7-amd64 -ansible_connection=lxc +ansible_connection=community.general.lxc diff --git a/tests/integration/targets/connection_lxd/test_connection.inventory b/tests/integration/targets/connection_lxd/test_connection.inventory index 9c5998eced..73ab06561f 100644 --- a/tests/integration/targets/connection_lxd/test_connection.inventory +++ b/tests/integration/targets/connection_lxd/test_connection.inventory @@ -3,4 +3,4 @@ lxd-pipelining ansible_ssh_pipelining=true lxd-no-pipelining ansible_ssh_pipelining=false [lxd:vars] ansible_host=centos-7-amd64 -ansible_connection=lxd +ansible_connection=community.general.lxd diff --git a/tests/integration/targets/inventory_cloudscale/playbooks/cleanup.yml b/tests/integration/targets/inventory_cloudscale/playbooks/cleanup.yml index acb3c907fc..f47bbe6eb0 100644 --- a/tests/integration/targets/inventory_cloudscale/playbooks/cleanup.yml +++ b/tests/integration/targets/inventory_cloudscale/playbooks/cleanup.yml @@ -8,7 +8,7 @@ register: server_list - name: Remove all servers created by this test run - cloudscale_server: + community.general.cloudscale_server: uuid: '{{ item.uuid }}' state: 'absent' when: cloudscale_resource_prefix in item.name diff --git a/tests/integration/targets/inventory_cloudscale/playbooks/setup.yml b/tests/integration/targets/inventory_cloudscale/playbooks/setup.yml index 90a5755954..59ccee9932 100644 --- a/tests/integration/targets/inventory_cloudscale/playbooks/setup.yml +++ b/tests/integration/targets/inventory_cloudscale/playbooks/setup.yml @@ -1,6 +1,6 @@ --- - name: Create server with public network only - cloudscale_server: + community.general.cloudscale_server: name: '{{ cloudscale_resource_prefix }}-inventory-public' flavor: '{{ cloudscale_test_flavor }}' image: '{{ cloudscale_test_image }}' @@ -10,7 +10,7 @@ register: server_public - name: Create server with private network only - cloudscale_server: + community.general.cloudscale_server: name: '{{ cloudscale_resource_prefix }}-inventory-private' flavor: '{{ cloudscale_test_flavor }}' image: '{{ cloudscale_alt_test_image }}' @@ -20,7 +20,7 @@ register: server_private - name: Create server with public and private network - cloudscale_server: + community.general.cloudscale_server: name: '{{ cloudscale_resource_prefix }}-inventory-public-private' flavor: '{{ cloudscale_test_flavor }}' image: '{{ cloudscale_test_image }}' @@ -49,7 +49,7 @@ with_sequence: count=2 - name: Create server with different prefix - cloudscale_server: + community.general.cloudscale_server: name: 'other-prefix-{{ cloudscale_resource_prefix }}-inventory' flavor: '{{ cloudscale_test_flavor }}' image: '{{ cloudscale_test_image }}' @@ -61,14 +61,14 @@ # it afterwards (which is possible). The resaon for this restriction is # that on creation a PTR entry for the server is created. - name: Create server to be renamed with unsafe characters - cloudscale_server: + community.general.cloudscale_server: name: '{{ cloudscale_resource_prefix }}-unsafe-chars' flavor: '{{ cloudscale_test_flavor }}' image: '{{ cloudscale_test_image }}' ssh_keys: '{{ cloudscale_test_ssh_key }}' register: server_unsafe_chars - name: Rename server to contain unsafe characters - cloudscale_server: + community.general.cloudscale_server: uuid: '{{ server_unsafe_chars.uuid }}' name: '{{ cloudscale_resource_prefix }}-snowmans-are-cool-☃!' register: server_unsafe_chars diff --git a/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml b/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml index 5b59c51a4f..b97106f550 100644 --- a/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml +++ b/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml @@ -10,6 +10,6 @@ name: setup_docker - name: Create a Swarm cluster - docker_swarm: + community.general.docker_swarm: state: present advertise_addr: "{{ansible_default_ipv4.address | default('127.0.0.1')}}" diff --git a/tests/integration/targets/lookup_hashi_vault/lookup_hashi_vault/tasks/approle_test.yml b/tests/integration/targets/lookup_hashi_vault/lookup_hashi_vault/tasks/approle_test.yml index d943f90846..36d0896fe9 100644 --- a/tests/integration/targets/lookup_hashi_vault/lookup_hashi_vault/tasks/approle_test.yml +++ b/tests/integration/targets/lookup_hashi_vault/lookup_hashi_vault/tasks/approle_test.yml @@ -5,7 +5,7 @@ - name: 'Fetch secrets using "hashi_vault" lookup' set_fact: secret1: "{{ lookup('community.general.hashi_vault', conn_params ~ 'secret=' ~ vault_kv2_path ~ '/secret1 auth_method=approle secret_id=' ~ secret_id ~ ' role_id=' ~ role_id) }}" - secret2: "{{ lookup('hashi_vault', conn_params ~ 'secret=' ~ vault_kv2_path ~ '/secret2 auth_method=approle secret_id=' ~ secret_id ~ ' role_id=' ~ role_id) }}" + secret2: "{{ lookup('community.general.hashi_vault', conn_params ~ 'secret=' ~ vault_kv2_path ~ '/secret2 auth_method=approle secret_id=' ~ secret_id ~ ' role_id=' ~ role_id) }}" - name: 'Check secret values' fail: diff --git a/tests/integration/targets/lookup_lmdb_kv/test.yml b/tests/integration/targets/lookup_lmdb_kv/test.yml index 3dca4b9877..1fa0b6150f 100644 --- a/tests/integration/targets/lookup_lmdb_kv/test.yml +++ b/tests/integration/targets/lookup_lmdb_kv/test.yml @@ -1,14 +1,14 @@ - hosts: localhost tasks: - debug: - msg: '{{ query(''lmdb_kv'', ''nl'', ''be'', ''lu'', db=''jp.mdb'') }}' + msg: '{{ query(''community.general.lmdb_kv'', ''nl'', ''be'', ''lu'', db=''jp.mdb'') }}' - debug: var: item.1 loop: '{{ query(''community.general.lmdb_kv'', db=''jp.mdb'') }}' - assert: that: - - query('lmdb_kv', 'nl', 'be', 'lu', db='jp.mdb') == ['Netherlands', 'Belgium', 'Luxembourg'] - - query('lmdb_kv', db='jp.mdb')|length == 5 + - query('community.general.lmdb_kv', 'nl', 'be', 'lu', db='jp.mdb') == ['Netherlands', 'Belgium', 'Luxembourg'] + - query('community.general.lmdb_kv', db='jp.mdb')|length == 5 - assert: that: - item.0 == 'nl' diff --git a/tests/integration/targets/lookup_passwordstore/tasks/tests.yml b/tests/integration/targets/lookup_passwordstore/tasks/tests.yml index 2978568640..d702edafef 100644 --- a/tests/integration/targets/lookup_passwordstore/tasks/tests.yml +++ b/tests/integration/targets/lookup_passwordstore/tasks/tests.yml @@ -50,11 +50,11 @@ - name: Create a password with equal sign set_fact: - newpass: "{{ lookup('passwordstore', 'test-pass-equal userpass=SimpleSample= create=yes') }}" + newpass: "{{ lookup('community.general.passwordstore', 'test-pass-equal userpass=SimpleSample= create=yes') }}" - name: Fetch a password with equal sign set_fact: - readpass: "{{ lookup('passwordstore', 'test-pass-equal') }}" + readpass: "{{ lookup('community.general.passwordstore', 'test-pass-equal') }}" - name: Verify password assert: