Merge pull request #5996 from ArtfulCoder/remove_cadvisor_manifest

Add salt configuration to remove cadvisor.manifest from master. cadvisor...
This commit is contained in:
Victor Marmol 2015-03-26 10:24:45 -07:00
commit 702a32fe9c

View File

@ -34,6 +34,7 @@ base:
- kube-scheduler - kube-scheduler
- monit - monit
- nginx - nginx
- cadvisor
- kube-client-tools - kube-client-tools
{% if grains['cloud'] is defined and grains['cloud'] != 'vagrant' %} {% if grains['cloud'] is defined and grains['cloud'] != 'vagrant' %}
- logrotate - logrotate