From be2bb2acbddf082080c1c1242c64b4d7da0fde8b Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Tue, 4 Dec 2018 16:12:03 -0500
Subject: [PATCH] Add user to override include_vars

We incorrectly added these variables in the pervious commits.

Change-Id: Iea437e4a9c6bfebeb64ec0a0cb80d261e0c9fa5a
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 tasks/config.yaml | 38 +++++++++++++++++++++++++++++---------
 vars/Debian.yaml  |  8 ++++----
 vars/RedHat.yaml  |  8 ++++----
 3 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/tasks/config.yaml b/tasks/config.yaml
index 43bd966..930ac7d 100644
--- a/tasks/config.yaml
+++ b/tasks/config.yaml
@@ -12,15 +12,25 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 ---
-- name: Install zookeeper configuration.
-  become: yes
-  template:
-    dest: "{{ zookeeper_file_zoo_conf_dest }}"
-    group: "{{ zookeeper_file_zoo_conf_group }}"
-    mode: "{{ zookeeper_file_zoo_conf_mode }}"
-    owner: "{{ zookeeper_file_zoo_conf_owner }}"
-    src: "{{ zookeeper_file_zoo_conf_src }}"
-  register: zookeeper_file_zoo_conf
+- name: Define zookeeper_file_myid_dest
+  set_fact:
+    zookeeper_file_myid_dest: "{{ __zookeeper_file_myid_dest }}"
+  when: zookeeper_file_myid_dest is not defined
+
+- name: Define zookeeper_file_myid_src
+  set_fact:
+    zookeeper_file_myid_src: "{{ __zookeeper_file_myid_src }}"
+  when: zookeeper_file_myid_src is not defined
+
+- name: Define zookeeper_file_zoo_conf_dest
+  set_fact:
+    zookeeper_file_zoo_conf_dest: "{{ __zookeeper_file_zoo_conf_dest }}"
+  when: zookeeper_file_zoo_conf_dest is not defined
+
+- name: Define zookeeper_file_zoo_conf_src
+  set_fact:
+    zookeeper_file_zoo_conf_src: "{{ __zookeeper_file_zoo_conf_src }}"
+  when: zookeeper_file_zoo_conf_src is not defined
 
 - name: Install zookeeper myid.
   become: yes
@@ -31,3 +41,13 @@
     owner: "{{ zookeeper_file_myid_owner }}"
     src: "{{ zookeeper_file_myid_src }}"
   register: zookeeper_file_myid
+
+- name: Install zookeeper configuration.
+  become: yes
+  template:
+    dest: "{{ zookeeper_file_zoo_conf_dest }}"
+    group: "{{ zookeeper_file_zoo_conf_group }}"
+    mode: "{{ zookeeper_file_zoo_conf_mode }}"
+    owner: "{{ zookeeper_file_zoo_conf_owner }}"
+    src: "{{ zookeeper_file_zoo_conf_src }}"
+  register: zookeeper_file_zoo_conf
diff --git a/vars/Debian.yaml b/vars/Debian.yaml
index 562f8d8..4ffd51d 100644
--- a/vars/Debian.yaml
+++ b/vars/Debian.yaml
@@ -27,8 +27,8 @@
 ---
 __zookeeper_package_name: zookeeperd
 
-zookeeper_file_myid_dest: /etc/zookeeper/conf/myid
-zookeeper_file_myid_src: etc/zookeeper/conf/myid
+__zookeeper_file_myid_dest: /etc/zookeeper/conf/myid
+__zookeeper_file_myid_src: etc/zookeeper/conf/myid
 
-zookeeper_file_zoo_conf_dest: /etc/zookeeper/conf/zoo.cfg
-zookeeper_file_zoo_conf_src: etc/zookeeper/conf/zoo.cfg
+__zookeeper_file_zoo_conf_dest: /etc/zookeeper/conf/zoo.cfg
+__zookeeper_file_zoo_conf_src: etc/zookeeper/conf/zoo.cfg
diff --git a/vars/RedHat.yaml b/vars/RedHat.yaml
index 748c5ea..4ea688c 100644
--- a/vars/RedHat.yaml
+++ b/vars/RedHat.yaml
@@ -14,10 +14,10 @@
 ---
 __zookeeper_package_name: zookeeper
 
-zookeeper_file_myid_dest: /var/lib/zookeeper/data
+__zookeeper_file_myid_dest: /var/lib/zookeeper/data
 # NOTE(pabelanger): Avoid creating a symlink, and point to Debian version.
-zookeeper_file_myid_src: etc/zookeeper/conf/myid
+__zookeeper_file_myid_src: etc/zookeeper/conf/myid
 
-zookeeper_file_zoo_conf_dest: /etc/zookeeper/zoo.cfg
+__zookeeper_file_zoo_conf_dest: /etc/zookeeper/zoo.cfg
 # NOTE(pabelanger): Avoid creating a symlink, and point to Debian version.
-zookeeper_file_zoo_conf_src: etc/zookeeper/conf/zoo.cfg
+__zookeeper_file_zoo_conf_src: etc/zookeeper/conf/zoo.cfg