Merge pull request #3546 from derekwaynecarr/disable_resource_defaults

Disable defaults plugin on vagrant
2015-01-15 16:45:29 -08:00
parent e12a78cb1d 123c96164e
commit cbfc468843
1 changed files with 1 additions and 1 deletions
--- a/cluster/vagrant/provision-master.sh
+++ b/cluster/vagrant/provision-master.sh
@@ -75,7 +75,7 @@ grains:
  cloud_provider: vagrant
  roles:
    - kubernetes-master
-  admission_control: ResourceDefaults,AlwaysAdmit
+  admission_control: AlwaysAdmit
 EOF

 mkdir -p /srv/salt-overlay/pillar