Merge pull request #7186 from ArtfulCoder/no_log_pod_on_master

removed elasticsearch and fluentd-gcp pods from master
This commit is contained in:
Dawn Chen 2015-04-22 14:40:07 -07:00
commit 87e0d5da08

View File

@ -60,14 +60,6 @@ base:
- kubelet
{% endif %}
{% if pillar.get('enable_node_logging', '').lower() == 'true' and pillar['logging_destination'] is defined %}
{% if pillar['logging_destination'] == 'elasticsearch' %}
- fluentd-es
{% elif pillar['logging_destination'] == 'gcp' %}
- fluentd-gcp
{% endif %}
{% endif %}
'roles:kubernetes-pool-vsphere':
- match: grain
- static-routes