github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1208 from derekwaynecarr/detangle_networking_from_os

Browse Source 
Detangle the use of a Red Hat OS family as requiring openvswitch
This commit is contained in:
brendandburns 2014-09-08 12:44:25 -07:00
commit cdd4af343c
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/sdn/init.sls
View File

@ -1,4 +1,4 @@
{% if grains['os_family'] == 'RedHat' %} {% if grains.network_mode is defined and grains.network_mode == 'openvswitch' %}
openvswitch: openvswitch:
pkg: pkg:

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

@ -37,6 +37,7 @@ cat <<EOF >/etc/salt/minion.d/grains.conf
grains: grains:
node_ip: $MASTER_IP node_ip: $MASTER_IP
master_ip: $MASTER_IP master_ip: $MASTER_IP
network_mode: openvswitch
etcd_servers: $MASTER_IP etcd_servers: $MASTER_IP
cloud_provider: vagrant cloud_provider: vagrant
roles: roles:

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

@ -44,6 +44,7 @@ echo "master: $MASTER_NAME" > /etc/salt/minion.d/master.conf
# Our minions will have a pool role to distinguish them from the master. # Our minions will have a pool role to distinguish them from the master.
cat <<EOF >/etc/salt/minion.d/grains.conf cat <<EOF >/etc/salt/minion.d/grains.conf
grains: grains:
network_mode: openvswitch
node_ip: $MINION_IP node_ip: $MINION_IP
etcd_servers: $MASTER_IP etcd_servers: $MASTER_IP
roles: roles:

1
docs/salt.md
View File

@ -59,6 +59,7 @@ hostnamef | (Optional) The full host name of the machine, i.e. hostname -f
master_ip | (Optional) The IP address that the apiserver will bind against master_ip | (Optional) The IP address that the 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*
roles | (Required) 1. **kubernetes-master** means this machine is the master in the kubernetes cluster. 2. **kubernetes-pool** means this machine is a kubernetes-minion. Depending on the role, the Salt scripts will provision different resources on the machine. roles | (Required) 1. **kubernetes-master** means this machine is the master in the kubernetes cluster. 2. **kubernetes-pool** means this machine is a kubernetes-minion. Depending on the role, the Salt scripts will provision different resources on the machine.
These keys may be leveraged by the Salt sls files to branch behavior. These keys may be leveraged by the Salt sls files to branch behavior.