Commit Graph

4 Commits (01bfbb5fa0462189932b704be32401822a991627)

Author SHA1 Message Date
Weixu Zhuang 4523429b20 Azure/ubuntu/saltstack support re-instated
This first reverts commit 8e8437dad8.
Also resolves conflicts with docs on f334fc41
And resolves conflicts with https://github.com/kubernetes/kubernetes/pull/22231/commits
to make people switching between two different methods of setting up by
setting env variables.

Conflicts:
	cluster/get-kube.sh
	cluster/saltbase/salt/README.md
	cluster/saltbase/salt/kube-proxy/default
	cluster/saltbase/salt/top.sls
2016-06-17 23:41:41 -07:00
Mike Danese 8e8437dad8 declare azure/ubuntu/saltstack bankruptcy 2015-10-16 18:21:21 -07:00
Jeff Mendoza adace2ccf5 Remove commented lines from openvpn config files. 2014-08-25 16:29:32 -07:00
Jeff Mendoza 13989794f8 Add salt configuration for openvpn for use on Azure.
Sets up openvpn for container to container communication. Azure
deploy scripts create certs used for openvpn conneciton. Salt
installs and configures openvpn.
2014-08-25 14:56:54 -07:00