Streamline path to certs dir (#3836)

* Streamline path to certs dir

* More fixes

* Set path to etcd certs in kubernetes defaults instead

roles/network_plugin/calico/defaults/main.yml

@@ -15,7 +15,6 @@ ipip_mode: Always  # change to "CrossSubnet" if you only want ipip encapsulation
 overwrite_hyperkube_cni: true
 
 calico_cert_dir: /etc/calico/certs
-etcd_cert_dir: /etc/ssl/etcd/ssl
 
 # Global as_num (/calico/bgp/v1/global/as_num)
 global_as_num: "64512"

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

@@ -4,7 +4,6 @@
 global_as_num: "64512"
 
 calico_cert_dir: /etc/calico/certs
-etcd_cert_dir: /etc/ssl/etcd/ssl
 
 # Limits for apps
 calico_rr_memory_limit: 1000M

roles/network_plugin/canal/defaults/main.yml

@@ -13,7 +13,6 @@ canal_log_level: "info"
 
 # Etcd SSL dirs
 canal_cert_dir: /etc/canal/certs
-etcd_cert_dir: /etc/ssl/etcd/ssl
 
 # Canal Network Policy directory
 canal_policy_dir: /etc/kubernetes/policy

roles/network_plugin/cilium/defaults/main.yml

@@ -5,7 +5,6 @@ cilium_disable_ipv4: false
 
 # Etcd SSL dirs
 cilium_cert_dir: /etc/cilium/certs
-etcd_cert_dir: /etc/ssl/etcd/ssl
 
 # Cilium Network Policy directory
 cilium_policy_dir: /etc/kubernetes/policy