summaryrefslogtreecommitdiffstats
path: root/roles/openshift_repos/tasks
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-02-17 13:05:12 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-03 09:05:42 -0500
commit50b9eefd2b6266b29755e37090138096a2aebc31 (patch)
tree5bb7d786e2a8d1c1d7144004ed60b6cb9c256a2a /roles/openshift_repos/tasks
parenta8edeaea8e8c67f5f930b54ccda5b575340231f5 (diff)
downloadopenshift-50b9eefd2b6266b29755e37090138096a2aebc31.tar.gz
openshift-50b9eefd2b6266b29755e37090138096a2aebc31.tar.bz2
openshift-50b9eefd2b6266b29755e37090138096a2aebc31.tar.xz
openshift-50b9eefd2b6266b29755e37090138096a2aebc31.zip
First past at the upgrade process
Diffstat (limited to 'roles/openshift_repos/tasks')
-rw-r--r--roles/openshift_repos/tasks/main.yaml13
1 files changed, 7 insertions, 6 deletions
diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml
index 6143805ca..af9fefec6 100644
--- a/roles/openshift_repos/tasks/main.yaml
+++ b/roles/openshift_repos/tasks/main.yaml
@@ -9,6 +9,7 @@
- assert:
that: openshift_deployment_type in known_openshift_deployment_types
+ when: not openshift.common.is_containerized | bool
- name: Ensure libselinux-python is installed
action: "{{ ansible_pkg_mgr }} name=libselinux-python state=present"
@@ -34,9 +35,9 @@
state: absent
with_fileglob:
- '*/repos/*'
- when: not (item | search("/files/" ~ openshift_deployment_type ~ "/repos")) and
- (ansible_os_family == "RedHat" and ansible_distribution != "Fedora")
- and not openshift.common.is_containerized | bool
+ 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")
notify: refresh cache
- name: Remove any yum repo files for other deployment types Fedora
@@ -45,9 +46,9 @@
state: absent
with_fileglob:
- '*/repos/*'
- when: not (item | search("/files/fedora-" ~ openshift_deployment_type ~ "/repos")) and
- (ansible_distribution == "Fedora")
- and not openshift.common.is_containerized | bool
+ when: not openshift.common.is_containerized | bool
+ and not (item | search("/files/fedora-" ~ openshift_deployment_type ~ "/repos"))
+ and (ansible_distribution == "Fedora")
notify: refresh cache
- name: Configure gpg keys if needed