diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-03 15:37:53 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-03 15:37:53 -0500 |
| commit | 26b37a59d52665bf2b7663326dd72a2262faf844 (patch) | |
| tree | 67a8f2b9c5b472204f0e56560c3defe87a11c072 /roles/openshift_repos/tasks | |
| parent | aef4ac6419d80b7002a7a6ab13ef8d928408e8d0 (diff) | |
| parent | 322689ef0dc93a39cc9fef2d86eecfdc11e953ef (diff) | |
| download | openshift-26b37a59d52665bf2b7663326dd72a2262faf844.tar.gz openshift-26b37a59d52665bf2b7663326dd72a2262faf844.tar.bz2 openshift-26b37a59d52665bf2b7663326dd72a2262faf844.tar.xz openshift-26b37a59d52665bf2b7663326dd72a2262faf844.zip | |
Merge pull request #1483 from brenton/32upgrade
First past at the upgrade process for 3.2
Diffstat (limited to 'roles/openshift_repos/tasks')
| -rw-r--r-- | roles/openshift_repos/tasks/main.yaml | 13 |
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 |