Rename minion->node

contrib/ansible/README.md

@@ -8,7 +8,7 @@ can be real hardware, VMs, things in a public cloud, etc.
 
 * Record the IP address of which machine you want to be your master
 * Record the IP address of the machine you want to be your etcd server (often same as master)
-* Record the IP addresses of the machines you want to be your minions. (master can be a minion)
+* Record the IP addresses of the machines you want to be your nodes. (master can be a node)
 
 Stick the system information into the 'inventory' file.
 

contrib/ansible/cluster.yml

@@ -19,11 +19,11 @@
         - masters
 
 # install kubernetes on the nodes
-- hosts: minions
+- hosts: nodes
   sudo: yes
   roles:
         - common
         - kubernetes
-        - minion
+        - node
   tags:
-        - minions
+        - nodes

contrib/ansible/inventory

@@ -1,10 +1,10 @@
-[masters]
-10.0.0.1
-
 [etcd]
 10.0.0.2
 
-[minions]
+[masters]
+10.0.0.1
+
+[nodes]
 10.0.0.3
 10.0.0.4
 10.0.0.5

contrib/ansible/roles/etcd/tasks/firewalld.yml

@@ -1,7 +1,7 @@
 ---
 - name: Open firewalld port for etcd
   firewalld: port={{ item }}/tcp permanent=false state=enabled
-  # in case this is also a minion where firewalld turned off
+  # in case this is also a node where firewalld turned off
   ignore_errors: yes
   with_items:
         - 2379
@@ -9,7 +9,7 @@
 
 - name: Save firewalld port for etcd
   firewalld: port={{ item }}/tcp permanent=true state=enabled
-  # in case this is also a minion where firewalld turned off
+  # in case this is also a node where firewalld turned off
   ignore_errors: yes
   with_items:
         - 2379

contrib/ansible/roles/master/tasks/firewalld.yml

@@ -1,10 +1,10 @@
 ---
 - name: Open firewalld port for apiserver
   firewalld: port=8080/tcp permanent=false state=enabled
-  # in case this is also a minion with firewalld turned off
+  # in case this is also a node with firewalld turned off
   ignore_errors: yes
 
 - name: Save firewalld port for apiserver
   firewalld: port=8080/tcp permanent=true state=enabled
-  # in case this is also a minion with firewalld turned off
+  # in case this is also a node with firewalld turned off
   ignore_errors: yes

contrib/ansible/roles/master/templates/apiserver.j2

@@ -10,7 +10,7 @@ KUBE_API_ADDRESS="--address=0.0.0.0"
 # The port on the local server to listen on.
 # KUBE_API_PORT="--port=8080"
 
-# Port minions listen on
+# Port nodes listen on
 # KUBELET_PORT="--kubelet_port=10250"
 
 # Address range to use for services

contrib/ansible/roles/node/templates/kubelet.j2

@@ -1,5 +1,5 @@
 ###
-# kubernetes kubelet (minion) config
+# kubernetes kubelet (node) config
 
 # The address for the info server to serve on (set to 0.0.0.0 or "" for all interfaces)
 KUBELET_ADDRESS="--address=0.0.0.0"