From 4ef9403aef6df97f01b44e483c5818726b2b75d9 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Mon, 8 Aug 2016 15:30:13 -0400 Subject: with_fileglob no longer supports wildcard prefixes. --- roles/openshift_repos/tasks/main.yaml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'roles/openshift_repos/tasks') diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml index d8e43438a..07a8d28fd 100644 --- a/roles/openshift_repos/tasks/main.yaml +++ b/roles/openshift_repos/tasks/main.yaml @@ -34,7 +34,12 @@ path: "/etc/yum.repos.d/{{ item | basename }}" state: absent with_fileglob: - - '*/repos/*' + - "fedora-openshift-enterprise/repos/*" + - "fedora-origin/repos/*" + - "online/repos/*" + - "openshift-enterprise/repos/*" + - "origin/repos/*" + - "removed/repos/*" when: not openshift.common.is_containerized | bool and not (item | search("/files/" ~ openshift_deployment_type ~ "/repos")) and (ansible_os_family == "RedHat" and ansible_distribution != "Fedora") @@ -42,10 +47,15 @@ - name: Remove any yum repo files for other deployment types Fedora file: - path: "/etc/yum.repos.d/{{ item | basename }}" + path: "{{ item | basename }}" state: absent with_fileglob: - - '*/repos/*' + - "fedora-openshift-enterprise/repos/*" + - "fedora-origin/repos/*" + - "online/repos/*" + - "openshift-enterprise/repos/*" + - "origin/repos/*" + - "removed/repos/*" when: not openshift.common.is_containerized | bool and not (item | search("/files/fedora-" ~ openshift_deployment_type ~ "/repos")) and (ansible_distribution == "Fedora") -- cgit v1.2.3