Merge pull request #818 from mattymo/calico-rr-certs

Fix calico-rr to use etcd certs instead of kube certs

roles/network_plugin/calico/rr/meta/main.yml

@@ -1,5 +1,5 @@
 dependencies:
-  - role: kubernetes/secrets
+  - role: etcd
   - role: docker
     when: ansible_os_family != "CoreOS"
   - role: download

roles/network_plugin/calico/rr/tasks/main.yml

@@ -7,7 +7,7 @@
   set_fact:
     rr_ip: "{{ calico_rr_ip | default(ip) | default(ansible_default_ipv4.address) }}"
 
-- name: Calico | Create calico certs directory
+- name: Calico-rr | Create calico certs directory
   file:
     dest: "{{ calico_cert_dir }}"
     state: directory
@@ -15,16 +15,16 @@
     owner: root
     group: root
 
-- name: Calico | Link etcd certificates for calico-node
+- name: Calico-rr | Link etcd certificates for calico-node
   file:
-    src: "{{ kube_cert_dir }}/{{ item.s }}"
+    src: "{{ etcd_cert_dir }}/{{ item.s }}"
     dest: "{{ calico_cert_dir }}/{{ item.d }}"
     state: hard
     force: yes
   with_items:
     - {s: "ca.pem", d: "ca_cert.crt"}
-    - {s: "node.pem", d: "cert.crt"}
-    - {s: "node-key.pem", d: "key.pem"}
+    - {s: "node-{{ inventory_hostname }}.pem", d: "cert.crt"}
+    - {s: "node-{{ inventory_hostname }}-key.pem", d: "key.pem"}
 
 - name: Calico-rr | Create dir for logs
   file: