github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

rm Salt grains.master_ip

Browse Source 
This appears in the Salt documentation, is set by Vagrant, but has no
consumers. Remove vestigial references.
This commit is contained in:
Zach Loafman 2015-03-31 17:31:47 -07:00
parent 00cb644f45
commit 0806e3bde0
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,6 @@ EOF
cat <<EOF >/etc/salt/minion.d/grains.conf cat <<EOF >/etc/salt/minion.d/grains.conf
grains: grains:
node_ip: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")' node_ip: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
master_ip: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
publicAddressOverride: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")' publicAddressOverride: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
network_mode: openvswitch network_mode: openvswitch
networkInterfaceName: eth1 networkInterfaceName: eth1

2
docs/salt.md
View File

@ -38,7 +38,6 @@ An example file is presented below using the Vagrant based environment.
``` ```
[root@kubernetes-master] $ cat /etc/salt/minion.d/grains.conf [root@kubernetes-master] $ cat /etc/salt/minion.d/grains.conf
grains: grains:
master_ip: $MASTER_IP
etcd_servers: $MASTER_IP etcd_servers: $MASTER_IP
cloud_provider: vagrant cloud_provider: vagrant
roles: roles:
@ -57,7 +56,6 @@ Key | Value
`cloud_provider` | (Optional) The cloud_provider used by apiserver: *gce*, *azure*, *vagrant* `cloud_provider` | (Optional) The cloud_provider used by apiserver: *gce*, *azure*, *vagrant*
`etcd_servers` | (Optional) Comma-delimited list of IP addresses the kube-apiserver and kubelet use to reach etcd. Uses the IP of the first machine in the kubernetes_master role. `etcd_servers` | (Optional) Comma-delimited list of IP addresses the kube-apiserver and kubelet use to reach etcd. Uses the IP of the first machine in the kubernetes_master role.
`hostnamef` | (Optional) The full host name of the machine, i.e. hostname -f `hostnamef` | (Optional) The full host name of the machine, i.e. hostname -f
`master_ip` | (Optional) The IP address that the kube-apiserver will bind against
`node_ip` | (Optional) The IP address to use to address this node `node_ip` | (Optional) The IP address to use to address this node
`minion_ip` | (Optional) Mapped to the kubelet hostname_override, K8S TODO - change this name `minion_ip` | (Optional) Mapped to the kubelet hostname_override, K8S TODO - change this name
`network_mode` | (Optional) Networking model to use among nodes: *openvswitch* `network_mode` | (Optional) Networking model to use among nodes: *openvswitch*