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 /playbooks/common/openshift-node | |
| 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 'playbooks/common/openshift-node')
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index 69ccb0cb8..483a7768c 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -16,6 +16,7 @@ hostname: "{{ openshift_hostname | default(None) }}" public_hostname: "{{ openshift_public_hostname | default(None) }}" deployment_type: "{{ openshift_deployment_type }}" + use_flannel: "{{ openshift_use_flannel | default(None) }}" - role: node local_facts: labels: "{{ openshift_node_labels | default(None) }}" @@ -181,6 +182,7 @@ - role: flannel when: openshift.common.use_flannel | bool - role: nickhammond.logrotate + when: not openshift.common.is_containerized | bool - role: fluentd_node when: openshift.common.use_fluentd | bool tasks: |