summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--roles/openshift_repos/files/fedora-openshift-enterprise/gpg_keys/.gitkeep0
-rw-r--r--roles/openshift_repos/files/fedora-openshift-enterprise/repos/.gitkeep0
-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.yaml16
5 files changed, 13 insertions, 3 deletions
diff --git a/roles/openshift_repos/files/fedora-openshift-enterprise/gpg_keys/.gitkeep b/roles/openshift_repos/files/fedora-openshift-enterprise/gpg_keys/.gitkeep
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/roles/openshift_repos/files/fedora-openshift-enterprise/gpg_keys/.gitkeep
diff --git a/roles/openshift_repos/files/fedora-openshift-enterprise/repos/.gitkeep b/roles/openshift_repos/files/fedora-openshift-enterprise/repos/.gitkeep
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/roles/openshift_repos/files/fedora-openshift-enterprise/repos/.gitkeep
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 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")