Merge pull request #1634 from bradbeam/calico_cni

fix for calico cni plugin node name

roles/network_plugin/calico/templates/cni-calico.conf.j2

 {
   "name": "calico-k8s-network",
-  "hostname": "{{ ansible_hostname }}",
+{% if cloud_provider is defined %}
+  "nodename": "{{ inventory_hostname }}",
+{% else %}
+  "nodename": "{{ ansible_hostname }}",
+{% endif %}
   "type": "calico",
   "etcd_endpoints": "{{ etcd_access_endpoint }}",
   "etcd_cert_file": "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem",