From e49b095b95b36f2afb43d8ef2322d37732df5d02 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Thu, 18 Aug 2016 16:23:11 -0400 Subject: Due to problems with with_fileglob lets avoid using it for now --- roles/openshift_repos/files/openshift-enterprise/gpg_keys/.gitkeep | 0 roles/openshift_repos/files/openshift-enterprise/repos/.gitkeep | 0 roles/openshift_repos/tasks/main.yaml | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 roles/openshift_repos/files/openshift-enterprise/gpg_keys/.gitkeep delete mode 100644 roles/openshift_repos/files/openshift-enterprise/repos/.gitkeep (limited to 'roles/openshift_repos') diff --git a/roles/openshift_repos/files/openshift-enterprise/gpg_keys/.gitkeep b/roles/openshift_repos/files/openshift-enterprise/gpg_keys/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/roles/openshift_repos/files/openshift-enterprise/repos/.gitkeep b/roles/openshift_repos/files/openshift-enterprise/repos/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml index 07a8d28fd..387ef1fbb 100644 --- a/roles/openshift_repos/tasks/main.yaml +++ b/roles/openshift_repos/tasks/main.yaml @@ -37,12 +37,12 @@ - "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") + and not openshift_deployment_type == 'openshift-enterprise' notify: refresh cache - name: Remove any yum repo files for other deployment types Fedora @@ -53,12 +53,12 @@ - "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") + and not openshift_deployment_type == 'openshift-enterprise' notify: refresh cache - name: Configure gpg keys if needed -- cgit v1.2.1