Merge pull request #6259 from zmerlynn/fix_cloud_provider

Eliminate grains.cloud_provider (in preference to grains.cloud) from SaltStack
2015-04-01 17:04:05 -04:00
parent d010b2a34e b581320bf7
commit 2af9b54147
4 changed files with 22 additions and 30 deletions
--- a/cluster/vagrant/provision-master.sh
+++ b/cluster/vagrant/provision-master.sh
@@ -80,7 +80,6 @@ grains:
  etcd_servers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
  api_servers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
  cloud: vagrant
-  cloud_provider: vagrant
  roles:
    - kubernetes-master
  runtime_config: '$(echo "$RUNTIME_CONFIG" | sed -e "s/'/''/g")'