github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8757 from invenfantasy/master

Browse Source 
remove duplicate configuration
This commit is contained in:
Saad Ali 2015-05-26 14:54:44 -07:00
commit e25af35252
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/vagrant/provision-master.sh
View File

@ -61,7 +61,6 @@ echo "127.0.0.1 localhost" >> /etc/hosts # enables cmds like 'kubectl get pods'
mkdir -p /etc/salt/minion.d mkdir -p /etc/salt/minion.d
cat <<EOF >/etc/salt/minion.d/master.conf cat <<EOF >/etc/salt/minion.d/master.conf
master: '$(echo "$MASTER_NAME" | sed -e "s/'/''/g")' master: '$(echo "$MASTER_NAME" | sed -e "s/'/''/g")'
master: '$(echo "$MASTER_NAME" | sed -e "s/'/''/g")'
auth_timeout: 10 auth_timeout: 10
auth_tries: 2 auth_tries: 2
auth_safemode: True auth_safemode: True