diff options
| author | Matt Woodson <mwoodson@gmail.com> | 2016-01-11 11:00:40 -0500 |
|---|---|---|
| committer | Matt Woodson <mwoodson@gmail.com> | 2016-01-11 11:00:40 -0500 |
| commit | 0bbfef4e1951db1f19135e532f78fe12cab6d4fc (patch) | |
| tree | c01a390c68d29bd8b6b7a29db794b594bfa11216 /roles/flannel | |
| parent | c607f1ba93be5e9f16723074ff97ffd27b025f8c (diff) | |
| parent | 2dc56faff5812ba436bffd2fcd3ec2ac57780286 (diff) | |
| download | openshift-0bbfef4e1951db1f19135e532f78fe12cab6d4fc.tar.gz openshift-0bbfef4e1951db1f19135e532f78fe12cab6d4fc.tar.bz2 openshift-0bbfef4e1951db1f19135e532f78fe12cab6d4fc.tar.xz openshift-0bbfef4e1951db1f19135e532f78fe12cab6d4fc.zip | |
Merge pull request #1155 from mwoodson/host_monitoring
merging master into prod
Diffstat (limited to 'roles/flannel')
| -rw-r--r-- | roles/flannel/tasks/main.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/flannel/tasks/main.yml b/roles/flannel/tasks/main.yml index 1e86176ea..aa27b674e 100644 --- a/roles/flannel/tasks/main.yml +++ b/roles/flannel/tasks/main.yml @@ -2,6 +2,7 @@ - name: Install flannel sudo: true action: "{{ ansible_pkg_mgr }} name=flannel state=present" + when: not openshift.common.is_containerized | bool - name: Set flannel etcd url sudo: true |