fix nginx proxy configuration conflicts (#3489)

* Allow configuration of nginx proxy config path

* Fix the internal nginx configuration location

Signed-off-by: Johann Queuniet <contact@lordran.net>

roles/kubernetes/node/defaults/main.yml

@@ -68,6 +68,7 @@ nginx_cpu_requests: 25m
 
 nginx_image_repo: nginx
 nginx_image_tag: 1.13
+nginx_config_dir: "/etc/nginx"
 
 etcd_config_dir: /etc/ssl/etcd
 

roles/kubernetes/node/tasks/nginx-proxy.yml

@@ -6,15 +6,15 @@
 
 - name: nginx-proxy | Make nginx directory
   file:
-    path: /etc/nginx
+    path: "{{ nginx_config_dir }}"
     state: directory
     mode: 0700
     owner: root
 
 - name: nginx-proxy | Write nginx-proxy configuration
   template:
     src: nginx.conf.j2
-    dest: "/etc/nginx/nginx.conf"
+    dest: "{{ nginx_config_dir }}/nginx.conf"
     owner: root
     mode: 0755
     backup: yes

roles/kubernetes/node/templates/manifests/nginx-proxy.manifest.j2

@@ -33,4 +33,4 @@ spec:
   volumes:
   - name: etc-nginx
     hostPath:
-      path: /etc/nginx
+      path: {{ nginx_config_dir }}

roles/reset/tasks/main.yml

@@ -120,7 +120,7 @@
     - /etc/ssl/etcd
     - /var/log/calico
     - /etc/cni
-    - /etc/nginx
+    - "{{ nginx_config_dir }}"
     - /etc/dnsmasq.d
     - /etc/dnsmasq.conf
     - /etc/dnsmasq.d-available