diff --git a/contrib/ansible/cluster.yml b/contrib/ansible/cluster.yml index 11829488a0e..4bdfd80b004 100644 --- a/contrib/ansible/cluster.yml +++ b/contrib/ansible/cluster.yml @@ -3,38 +3,38 @@ - hosts: etcd sudo: yes roles: - - common - - etcd + - common + - etcd tags: - - etcd + - etcd # install flannel - hosts: - - etcd - - masters - - nodes + - etcd + - masters + - nodes sudo: yes roles: - - flannel + - flannel tags: - - flannel + - flannel # install kube master services - hosts: masters sudo: yes roles: - - common - - kubernetes - - master + - common + - kubernetes + - master tags: - - masters + - masters # install kubernetes on the nodes - hosts: nodes sudo: yes roles: - - common - - kubernetes - - node + - common + - kubernetes + - node tags: - - nodes + - nodes diff --git a/contrib/ansible/group_vars/all.yml b/contrib/ansible/group_vars/all.yml index 456854204a7..89ffd8090f8 100644 --- a/contrib/ansible/group_vars/all.yml +++ b/contrib/ansible/group_vars/all.yml @@ -5,7 +5,7 @@ cluster_name: kube.local # Account name of remote user. Ansible will use this user account to ssh into # the managed machines. The user must be able to use sudo without asking # for password unless ansible_sudo_pass is set -ansible_ssh_user: root +#ansible_ssh_user: root # password for the ansible_ssh_user. If this is unset you will need to set up # ssh keys so a password is not needed. diff --git a/contrib/ansible/inventory b/contrib/ansible/inventory index 7b43d91c3e6..a03104b113b 100644 --- a/contrib/ansible/inventory +++ b/contrib/ansible/inventory @@ -1,10 +1,10 @@ -[etcd] -10.0.0.2 [masters] -10.0.0.1 +kube-master-test-01.example.com + +[etcd] +kube-master-test-01.example.com [nodes] -10.0.0.3 -10.0.0.4 -10.0.0.5 +kube-minion-test-01.example.com +kube-minion-test-02.example.com diff --git a/contrib/ansible/roles/common/tasks/rpm.yml b/contrib/ansible/roles/common/tasks/rpm.yml index 959be43dbdf..9206e07e4e7 100644 --- a/contrib/ansible/roles/common/tasks/rpm.yml +++ b/contrib/ansible/roles/common/tasks/rpm.yml @@ -1,5 +1,5 @@ --- -- name: Determine if firewalld installed +- name: RPM | Determine if firewalld installed command: "rpm -q firewalld" register: s changed_when: false diff --git a/contrib/ansible/roles/etcd/tasks/firewalld.yml b/contrib/ansible/roles/etcd/tasks/firewalld.yml index dc2978c314b..10a47e60254 100644 --- a/contrib/ansible/roles/etcd/tasks/firewalld.yml +++ b/contrib/ansible/roles/etcd/tasks/firewalld.yml @@ -4,13 +4,13 @@ # in case this is also a node where firewalld turned off ignore_errors: yes with_items: - - 2379 - - 2380 + - 2379 + - 2380 - name: Save firewalld port for etcd firewalld: port={{ item }}/tcp permanent=true state=enabled # in case this is also a node where firewalld turned off ignore_errors: yes with_items: - - 2379 - - 2380 + - 2379 + - 2380 diff --git a/contrib/ansible/roles/etcd/tasks/iptables.yml b/contrib/ansible/roles/etcd/tasks/iptables.yml index d8329955342..b6eb99eb3f5 100644 --- a/contrib/ansible/roles/etcd/tasks/iptables.yml +++ b/contrib/ansible/roles/etcd/tasks/iptables.yml @@ -11,7 +11,7 @@ command: /sbin/iptables -I INPUT 1 -p tcp --dport {{ item }} -j ACCEPT -m comment --comment "etcd" when: etcd not in iptablesrules.stdout notify: - - Save iptables rules + - Save iptables rules with_items: - - 2379 - - 2380 + - 2379 + - 2380 diff --git a/contrib/ansible/roles/etcd/tasks/main.yml b/contrib/ansible/roles/etcd/tasks/main.yml index 527bfd6abc0..d5540f5af0f 100644 --- a/contrib/ansible/roles/etcd/tasks/main.yml +++ b/contrib/ansible/roles/etcd/tasks/main.yml @@ -5,13 +5,13 @@ name: etcd state: latest notify: - - restart etcd + - restart etcd when: not is_atomic - name: Write etcd config file template: src=etcd.conf.j2 dest=/etc/etcd/etcd.conf notify: - - restart etcd + - restart etcd - name: Enable etcd service: name=etcd enabled=yes diff --git a/contrib/ansible/roles/flannel/tasks/client.yml b/contrib/ansible/roles/flannel/tasks/client.yml index 6f124404a72..c99ae3b6947 100644 --- a/contrib/ansible/roles/flannel/tasks/client.yml +++ b/contrib/ansible/roles/flannel/tasks/client.yml @@ -9,9 +9,9 @@ - name: Install Flannel config file template: src=flanneld.j2 dest=/etc/sysconfig/flanneld notify: - - restart flannel + - restart flannel - name: Launch Flannel service: name=flanneld state=started enabled=yes notify: - - restart flannel + - restart flannel diff --git a/contrib/ansible/roles/kubernetes/tasks/fedora.yml b/contrib/ansible/roles/kubernetes/tasks/fedora.yml index be021d2d9d3..ad326e3c5c4 100644 --- a/contrib/ansible/roles/kubernetes/tasks/fedora.yml +++ b/contrib/ansible/roles/kubernetes/tasks/fedora.yml @@ -1,4 +1,4 @@ --- -- name: Remove docker window manager on F20 +- name: Fedora | Remove docker window manager on F20 yum: pkg=docker state=absent when: not is_atomic and ansible_distribution_major_version == "20" diff --git a/contrib/ansible/roles/kubernetes/tasks/main.yml b/contrib/ansible/roles/kubernetes/tasks/main.yml index ac004f052b1..f7eccd4425d 100644 --- a/contrib/ansible/roles/kubernetes/tasks/main.yml +++ b/contrib/ansible/roles/kubernetes/tasks/main.yml @@ -5,4 +5,4 @@ - name: write the global config file template: src=config.j2 dest=/etc/kubernetes/config notify: - - restart daemons + - restart daemons diff --git a/contrib/ansible/roles/master/handlers/main.yml b/contrib/ansible/roles/master/handlers/main.yml index fc40e9017de..10985570a91 100644 --- a/contrib/ansible/roles/master/handlers/main.yml +++ b/contrib/ansible/roles/master/handlers/main.yml @@ -2,9 +2,9 @@ - name: restart daemons command: /bin/true notify: - - restart apiserver - - restart controller-manager - - restart scheduler + - restart apiserver + - restart controller-manager + - restart scheduler - name: restart apiserver service: name=kube-apiserver state=restarted diff --git a/contrib/ansible/roles/master/tasks/iptables.yml b/contrib/ansible/roles/master/tasks/iptables.yml index e0aef1ef4c9..cc9e2d9d1ce 100644 --- a/contrib/ansible/roles/master/tasks/iptables.yml +++ b/contrib/ansible/roles/master/tasks/iptables.yml @@ -8,7 +8,7 @@ command: /sbin/iptables -I INPUT 1 -p tcp --dport 8080 -j ACCEPT -m comment --comment "kube-apiserver" when: kube-apiserver not in iptablesrules.stdout notify: - - restart iptables + - restart iptables - name: Save iptables rules command: service iptables save diff --git a/contrib/ansible/roles/master/tasks/main.yml b/contrib/ansible/roles/master/tasks/main.yml index aadbbd4bd52..d5b66204b7c 100644 --- a/contrib/ansible/roles/master/tasks/main.yml +++ b/contrib/ansible/roles/master/tasks/main.yml @@ -2,26 +2,26 @@ - name: Install kubernetes action: "{{ ansible_pkg_mgr }}" args: - name: kubernetes-master - state: latest + name: kubernetes-master + state: latest notify: - - restart daemons + - restart daemons when: not is_atomic - name: write the config file for the api server template: src=apiserver.j2 dest=/etc/kubernetes/apiserver notify: - - restart apiserver + - restart apiserver - name: write the config file for the controller-manager copy: src=controller-manager dest=/etc/kubernetes/controller-manager notify: - - restart controller-manager + - restart controller-manager - name: write the config file for the scheduler copy: src=scheduler dest=/etc/kubernetes/scheduler notify: - - restart scheduler + - restart scheduler - name: Enable apiserver service: name=kube-apiserver enabled=yes state=started diff --git a/contrib/ansible/roles/node/handlers/main.yml b/contrib/ansible/roles/node/handlers/main.yml index 196a3a6e5d9..fd00563b38b 100644 --- a/contrib/ansible/roles/node/handlers/main.yml +++ b/contrib/ansible/roles/node/handlers/main.yml @@ -2,8 +2,8 @@ - name: restart daemons command: /bin/true notify: - - restart kubelet - - restart proxy + - restart kubelet + - restart proxy - name: restart kubelet service: name=kubelet state=restarted diff --git a/contrib/ansible/roles/node/tasks/iptables.yml b/contrib/ansible/roles/node/tasks/iptables.yml index 53fc09c9521..afb801e98d8 100644 --- a/contrib/ansible/roles/node/tasks/iptables.yml +++ b/contrib/ansible/roles/node/tasks/iptables.yml @@ -11,7 +11,7 @@ command: /sbin/iptables -I INPUT 1 -p tcp --dport 10250 -j ACCEPT -m comment --comment "kubelet" when: kubelet not in iptablesrules.stdout notify: - - restart iptables + - restart iptables - name: Save iptables rules command: service iptables save diff --git a/contrib/ansible/roles/node/tasks/main.yml b/contrib/ansible/roles/node/tasks/main.yml index a24d1293725..501b3399c66 100644 --- a/contrib/ansible/roles/node/tasks/main.yml +++ b/contrib/ansible/roles/node/tasks/main.yml @@ -2,21 +2,21 @@ - name: Install kubernetes action: "{{ ansible_pkg_mgr }}" args: - name: kubernetes-node - state: latest + name: kubernetes-node + state: latest notify: - - restart daemons + - restart daemons when: not is_atomic - name: write the config files for kubelet template: src=kubelet.j2 dest=/etc/kubernetes/kubelet notify: - - restart kubelet + - restart kubelet - name: write the config files for proxy copy: src=proxy dest=/etc/kubernetes/proxy notify: - - restart proxy + - restart proxy - name: Enable kubelet service: name=kubelet enabled=yes state=started