From 90b1318168739451714452d41d6e1cb24cb36412 Mon Sep 17 00:00:00 2001
From: Jeff Bean <jeffreyrobertbean@gmail.com>
Date: Mon, 6 Jul 2015 17:27:08 -0700
Subject: [PATCH] Ansible: Adding variable for kubernetes addon dir

---
 contrib/ansible/roles/kubernetes-addons/defaults/main.yml   | 3 +++
 .../roles/kubernetes-addons/tasks/cluster-logging.yml       | 6 +++---
 .../roles/kubernetes-addons/tasks/cluster-monitoring.yml    | 4 ++--
 contrib/ansible/roles/kubernetes-addons/tasks/main.yml      | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/contrib/ansible/roles/kubernetes-addons/defaults/main.yml b/contrib/ansible/roles/kubernetes-addons/defaults/main.yml
index 203f93aa7f6..90332eb6fea 100644
--- a/contrib/ansible/roles/kubernetes-addons/defaults/main.yml
+++ b/contrib/ansible/roles/kubernetes-addons/defaults/main.yml
@@ -1 +1,4 @@
+kube_addons_dir: "{{ kube_config_dir }}/addons"
+
+
 local_temp_addon_dir: /tmp/kubernetes/addons
diff --git a/contrib/ansible/roles/kubernetes-addons/tasks/cluster-logging.yml b/contrib/ansible/roles/kubernetes-addons/tasks/cluster-logging.yml
index 3cc9c0951bc..b73f39fcb57 100644
--- a/contrib/ansible/roles/kubernetes-addons/tasks/cluster-logging.yml
+++ b/contrib/ansible/roles/kubernetes-addons/tasks/cluster-logging.yml
@@ -1,11 +1,11 @@
 ---
-- name: LOGGING | Assures {{ kube_config_dir }}/addons/cluster-logging dir exists
-  file: path={{ kube_config_dir }}/addons/cluster-logging state=directory
+- name: LOGGING | Assures {{ kube_addons_dir }}/cluster-logging dir exists
+  file: path={{ kube_addons_dir }}/cluster-logging state=directory
 
 - name: LOGGING | Download logging files from Kubernetes repo
   get_url:
     url=https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/cluster/addons/fluentd-elasticsearch/{{ item }}
-    dest="{{ kube_config_dir }}/addons/cluster-logging/"
+    dest="{{ kube_addons_dir }}/cluster-logging/"
     force=yes
   with_items:
     - es-controller.yaml
diff --git a/contrib/ansible/roles/kubernetes-addons/tasks/cluster-monitoring.yml b/contrib/ansible/roles/kubernetes-addons/tasks/cluster-monitoring.yml
index 71120c7618e..b505ea2ebf4 100644
--- a/contrib/ansible/roles/kubernetes-addons/tasks/cluster-monitoring.yml
+++ b/contrib/ansible/roles/kubernetes-addons/tasks/cluster-monitoring.yml
@@ -1,11 +1,11 @@
 ---
 - name: MONITORING | Assures {{ kube_config_dir }}/addons/cluster-monitoring dir exists
-  file: path={{ kube_config_dir }}/addons/cluster-monitoring state=directory
+  file: path={{ kube_addons_dir }}/cluster-monitoring state=directory
 
 - name: MONITORING | Download monitoring files from Kubernetes repo
   get_url:
     url=https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/cluster/addons/cluster-monitoring/influxdb/{{ item }}
-    dest="{{ kube_config_dir }}/addons/cluster-monitoring/"
+    dest="{{ kube_addons_dir }}/cluster-monitoring/"
     force=yes
   with_items:
     - grafana-service.yaml
diff --git a/contrib/ansible/roles/kubernetes-addons/tasks/main.yml b/contrib/ansible/roles/kubernetes-addons/tasks/main.yml
index 739f87415e0..109b1478b38 100644
--- a/contrib/ansible/roles/kubernetes-addons/tasks/main.yml
+++ b/contrib/ansible/roles/kubernetes-addons/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
-- name: Assures /etc/kubernetes/addons/ dir exists
-  file: path=/etc/kubernetes/addons/ state=directory
+- name: Assures addons dir exists
+  file: path={{ kube_addons_dir }} state=directory
 
 - include: generic-install.yml
   when: not is_atomic