diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-23 09:30:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-23 09:30:59 -0400 |
| commit | 3e6d4304dfe8b5c0a643ea61addd43f7c60a52b6 (patch) | |
| tree | ccad8e2a90aab7a7b6b49d6bb13c16e1b690cb24 /roles | |
| parent | 39d87c8ff79caddd9ff56d19846a9d8ecf5164e0 (diff) | |
| parent | b37dc76c416d1766919f0ea39c9817ddd744acec (diff) | |
| download | openshift-3e6d4304dfe8b5c0a643ea61addd43f7c60a52b6.tar.gz openshift-3e6d4304dfe8b5c0a643ea61addd43f7c60a52b6.tar.bz2 openshift-3e6d4304dfe8b5c0a643ea61addd43f7c60a52b6.tar.xz openshift-3e6d4304dfe8b5c0a643ea61addd43f7c60a52b6.zip | |
Merge pull request #2344 from openshift/revert-2325-fileglobglob
Revert "Due to problems with with_fileglob lets avoid using it for now"
Diffstat (limited to 'roles')
3 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_repos/files/openshift-enterprise/gpg_keys/.gitkeep b/roles/openshift_repos/files/openshift-enterprise/gpg_keys/.gitkeep new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/roles/openshift_repos/files/openshift-enterprise/gpg_keys/.gitkeep diff --git a/roles/openshift_repos/files/openshift-enterprise/repos/.gitkeep b/roles/openshift_repos/files/openshift-enterprise/repos/.gitkeep new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/roles/openshift_repos/files/openshift-enterprise/repos/.gitkeep diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml index 387ef1fbb..07a8d28fd 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 |