From 29614d3fe0d684dec4b5a439e183cdb71721ef07 Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Tue, 3 Nov 2015 09:30:24 -0800 Subject: [PATCH] Enable supervisord for other cloud providers. --- cluster/saltbase/salt/top.sls | 8 -------- 1 file changed, 8 deletions(-) diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls index b820b62a794..d47d6cceaee 100644 --- a/cluster/saltbase/salt/top.sls +++ b/cluster/saltbase/salt/top.sls @@ -33,11 +33,7 @@ base: - kube-registry-proxy {% endif %} - logrotate -{% if grains['cloud'] is defined and grains.cloud == 'gce' %} - supervisor -{% else %} - - monit -{% endif %} 'roles:kubernetes-master': - match: grain @@ -46,11 +42,7 @@ base: - kube-apiserver - kube-controller-manager - kube-scheduler -{% if grains['cloud'] is defined and grains.cloud == 'gce' %} - supervisor -{% else %} - - monit -{% endif %} {% if grains['cloud'] is defined and not grains.cloud in [ 'aws', 'gce', 'vagrant' ] %} - nginx {% endif %}