Merge pull request #5390 from brendandburns/shell_sucks

Configure docker on the master like we do on workers.
2025-09-17 15:13:08 +00:00 · 2015-03-12 11:42:03 -07:00
parent 27c77567d9 17ff8fb421
commit e16bcceceb
4 changed files with 8 additions and 0 deletions
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -48,6 +48,10 @@ base:
    - docker
    - sdn
 {% endif %}
+{% if grains['cloud'] is defined and grains['cloud'] == 'gce' %}
+    - docker
+{% endif %}
+

  'roles:kubernetes-pool-vsphere':
    - match: grain