Merge "Take kubeproxy_options into account on proxy setup"

magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh

@@ -62,6 +62,7 @@ CERT_DIR=/etc/kubernetes/certs
 PROXY_KUBECONFIG=/etc/kubernetes/proxy-kubeconfig.yaml
 cat > /etc/kubernetes/proxy << EOF
 KUBE_PROXY_ARGS="--kubeconfig=${PROXY_KUBECONFIG} --cluster-cidr=${PODS_NETWORK_CIDR}"
+KUBE_PROXY_ARGS="${KUBE_PROXY_ARGS} ${KUBEPROXY_OPTIONS}"
 EOF
 
 cat > ${PROXY_KUBECONFIG} << EOF

magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh

@@ -202,8 +202,9 @@ sed -i '
 
 cat > /etc/kubernetes/proxy << EOF
 KUBE_PROXY_ARGS="--kubeconfig=${PROXY_KUBECONFIG} --cluster-cidr=${PODS_NETWORK_CIDR}"
+KUBE_PROXY_ARGS="${KUBE_PROXY_ARGS} ${KUBEPROXY_OPTIONS}"
 EOF
 
 cat >> /etc/environment <<EOF
 KUBERNETES_MASTER=$KUBE_MASTER_URI
-EOF
+EOF