Move customizations of /srv/salt to overlay

Also see #1783.
This commit is contained in:
Pieter Noordhuis
2014-10-29 10:22:03 -07:00
parent 5ba3a551f9
commit 5b22dd7631
3 changed files with 29 additions and 8 deletions

View File

@@ -294,6 +294,7 @@ function kube-up {
echo "readonly SERVER_BINARY_TAR='${SERVER_BINARY_TAR##*/}'"
echo "readonly SALT_TAR='${SALT_TAR##*/}'"
echo "readonly MASTER_HTPASSWD='${htpasswd}'"
grep -v "^#" "${KUBE_ROOT}/cluster/vsphere/templates/create-dynamic-salt-files.sh"
grep -v "^#" "${KUBE_ROOT}/cluster/vsphere/templates/install-release.sh"
grep -v "^#" "${KUBE_ROOT}/cluster/vsphere/templates/salt-master.sh"
) > "${KUBE_TEMP}/master-start.sh"