From ac9ee36abb55dec399252350c9d7dd957da89802 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Wed, 4 Mar 2020 14:22:51 -0600 Subject: [PATCH] Fixes #44: Fix bare variable deprecation warning by cleaning up unnecessary variable. --- molecule/default/tasks/crd.yml | 2 +- molecule/default/vars/main.yml | 2 -- tests/integration/targets/kubernetes/defaults/main.yml | 2 -- tests/integration/targets/kubernetes/tasks/main.yml | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/molecule/default/tasks/crd.yml b/molecule/default/tasks/crd.yml index 3d014af8..9b1f5e89 100644 --- a/molecule/default/tasks/crd.yml +++ b/molecule/default/tasks/crd.yml @@ -30,7 +30,7 @@ - name: Assert that recreating crd is as expected assert: that: - - recreate_crd_default_merge_expectation + - recreate_crd is not failed - block: - name: Recreate custom resource definition with merge_type diff --git a/molecule/default/vars/main.yml b/molecule/default/vars/main.yml index 27670cfc..8368ae27 100644 --- a/molecule/default/vars/main.yml +++ b/molecule/default/vars/main.yml @@ -1,6 +1,4 @@ --- -recreate_crd_default_merge_expectation: recreate_crd is not failed - k8s_pod_metadata: labels: app: "{{ k8s_pod_name }}" diff --git a/tests/integration/targets/kubernetes/defaults/main.yml b/tests/integration/targets/kubernetes/defaults/main.yml index d1271d67..e46ca26f 100644 --- a/tests/integration/targets/kubernetes/defaults/main.yml +++ b/tests/integration/targets/kubernetes/defaults/main.yml @@ -1,4 +1,2 @@ --- -recreate_crd_default_merge_expectation: recreate_crd is not failed - k8s_openshift: true diff --git a/tests/integration/targets/kubernetes/tasks/main.yml b/tests/integration/targets/kubernetes/tasks/main.yml index a7263f3d..b50df180 100644 --- a/tests/integration/targets/kubernetes/tasks/main.yml +++ b/tests/integration/targets/kubernetes/tasks/main.yml @@ -65,7 +65,6 @@ - include_tasks: older_openshift_fail.yml vars: ansible_python_interpreter: "{{ virtualenv_interpreter }}" - recreate_crd_default_merge_expectation: recreate_crd is failed playbook_namespace: ansible-test-k8s-older-openshift - file: