diff --git a/defaults/main.yaml b/defaults/main.yaml index a2a546a..86bf66d 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -19,11 +19,9 @@ zookeeper_task_manager: - service # tasks/config.yaml -zookeeper_file_zoo_conf_dest: /etc/zookeeper/zoo.cfg zookeeper_file_zoo_conf_group: zookeeper zookeeper_file_zoo_conf_mode: 0644 zookeeper_file_zoo_conf_owner: zookeeper -zookeeper_file_zoo_conf_src: etc/zookeeper/zoo.cfg # tasks/install.yaml zookeeper_package_state: installed diff --git a/templates/etc/zookeeper/zoo.cfg b/templates/etc/zookeeper/conf/zoo.cfg similarity index 100% rename from templates/etc/zookeeper/zoo.cfg rename to templates/etc/zookeeper/conf/zoo.cfg diff --git a/vars/Debian.yaml b/vars/Debian.yaml index b7e9b26..b8e95a9 100644 --- a/vars/Debian.yaml +++ b/vars/Debian.yaml @@ -26,3 +26,6 @@ # under the License. --- __zookeeper_package_name: zookeeperd + +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 e2c6ed2..97c9ad3 100644 --- a/vars/RedHat.yaml +++ b/vars/RedHat.yaml @@ -13,3 +13,7 @@ # under the License. --- __zookeeper_package_name: zookeeper + +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