diff --git a/contrib/ansible/roles/kubernetes/tasks/place_certs.yml b/contrib/ansible/roles/kubernetes/tasks/place_certs.yml index a3c7d8e032d..2271fd1115a 100644 --- a/contrib/ansible/roles/kubernetes/tasks/place_certs.yml +++ b/contrib/ansible/roles/kubernetes/tasks/place_certs.yml @@ -1,12 +1,16 @@ --- -- name: place ssh public key so apiserver can push certs +- name: place ssh public key on other nodes so apiserver can push certs authorized_key: user=root key="{{ item }}" state=present with_file: - '/tmp/id_rsa.pub' changed_when: false - name: Copy certificates directly from the apiserver to nodes - synchronize: src={{ kube_cert_dir }}/{{ item }} dest={{ kube_cert_dir }}/{{ item }} + synchronize: + src={{ kube_cert_dir }}/{{ item }} + dest={{ kube_cert_dir }}/{{ item }} + rsync_timeout=30 + set_remote_user=no delegate_to: "{{ groups['masters'][0] }}" with_items: - "ca.crt" diff --git a/contrib/ansible/roles/master/tasks/centos.yml b/contrib/ansible/roles/master/tasks/centos.yml index 88777cd2545..4564d18cf42 100644 --- a/contrib/ansible/roles/master/tasks/centos.yml +++ b/contrib/ansible/roles/master/tasks/centos.yml @@ -1,5 +1,8 @@ --- - name: CentOS | Install kubernetes CentOS style - yum: pkg=kubernetes state=latest enablerepo=virt7-testing + yum: + pkg=kubernetes-master + state=latest + enablerepo=virt7-testing notify: - restart daemons diff --git a/contrib/ansible/roles/node/tasks/centos.yml b/contrib/ansible/roles/node/tasks/centos.yml index 88777cd2545..638ab440ef0 100644 --- a/contrib/ansible/roles/node/tasks/centos.yml +++ b/contrib/ansible/roles/node/tasks/centos.yml @@ -1,5 +1,5 @@ --- - name: CentOS | Install kubernetes CentOS style - yum: pkg=kubernetes state=latest enablerepo=virt7-testing + yum: pkg=kubernetes-node state=latest enablerepo=virt7-testing notify: - restart daemons diff --git a/contrib/ansible/vagrant/Vagrantfile b/contrib/ansible/vagrant/Vagrantfile index dd469edca1b..05220d2c281 100644 --- a/contrib/ansible/vagrant/Vagrantfile +++ b/contrib/ansible/vagrant/Vagrantfile @@ -20,11 +20,6 @@ Vagrant.configure(2) do |config| node.vm.hostname = "node-#{i}.vms.local" node.vm.network "private_network", ip: "192.168.1.1#{i}" node.vm.provision :ansible do |ansible| - ansible.groups = { - "masters" => ["master"], - "nodes" => ["node-1", "node-2"], - "etcd" => ["master"] - } ansible.host_key_checking = false ansible.extra_vars = { ansible_ssh_user: 'vagrant',