summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-08-19 13:11:57 -0400
committerGitHub <noreply@github.com>2016-08-19 13:11:57 -0400
commit1dcf0cfda76b8adea076f98c55da4ba147e512df (patch)
treee2a18284c167c2b23e858693ce2b3be656aebec1 /roles
parent7abcd773216b6bd61a893ee6eaee3ccdff494a31 (diff)
parente49b095b95b36f2afb43d8ef2322d37732df5d02 (diff)
downloadopenshift-1dcf0cfda76b8adea076f98c55da4ba147e512df.tar.gz
openshift-1dcf0cfda76b8adea076f98c55da4ba147e512df.tar.bz2
openshift-1dcf0cfda76b8adea076f98c55da4ba147e512df.tar.xz
openshift-1dcf0cfda76b8adea076f98c55da4ba147e512df.zip
Merge pull request #2325 from sdodson/fileglobglob
Due to problems with with_fileglob lets avoid using it for now
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_repos/files/openshift-enterprise/gpg_keys/.gitkeep0
-rw-r--r--roles/openshift_repos/files/openshift-enterprise/repos/.gitkeep0
-rw-r--r--roles/openshift_repos/tasks/main.yaml4
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
deleted file mode 100644
index e69de29bb..000000000
--- a/roles/openshift_repos/files/openshift-enterprise/gpg_keys/.gitkeep
+++ /dev/null
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
--- a/roles/openshift_repos/files/openshift-enterprise/repos/.gitkeep
+++ /dev/null
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