summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-08 10:21:24 -0500
committerGitHub <noreply@github.com>2016-11-08 10:21:24 -0500
commite2991e3ef9ce38192cb5291bfc79d8e1bb1b0bba (patch)
tree904196e421232554ba1ab5d58c9cb5dfa4835eea
parente461e0ffb3fc76d42019eeaa0c78909733c2951f (diff)
parent7f101b36b72213b8f098246b73d373ef25f2ef99 (diff)
downloadopenshift-e2991e3ef9ce38192cb5291bfc79d8e1bb1b0bba.tar.gz
openshift-e2991e3ef9ce38192cb5291bfc79d8e1bb1b0bba.tar.bz2
openshift-e2991e3ef9ce38192cb5291bfc79d8e1bb1b0bba.tar.xz
openshift-e2991e3ef9ce38192cb5291bfc79d8e1bb1b0bba.zip
Merge pull request #2759 from sdodson/flannel-containerized
Install flannel RPM on containerized but not atomic
-rw-r--r--roles/flannel/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/flannel/tasks/main.yml b/roles/flannel/tasks/main.yml
index f5b16fb76..a15969568 100644
--- a/roles/flannel/tasks/main.yml
+++ b/roles/flannel/tasks/main.yml
@@ -2,7 +2,7 @@
- name: Install flannel
become: yes
action: "{{ ansible_pkg_mgr }} name=flannel state=present"
- when: not openshift.common.is_containerized | bool
+ when: not openshift.common.is_atomic | bool
- name: Set flannel etcd options
become: yes