From b8b9d63592eab5437c9ea8cdbbb44041a2bcc61d Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Mon, 16 Jan 2017 15:12:53 -0600 Subject: [PATCH] Deploy lsyncd config properly on CentOS This patch deploys the lsyncd configuration file and defaults file to their proper locations on CentOS systems. Closes-Bug: 1656945 Change-Id: I375ce4c3dbc6a362057a22fef389f5ac652ddd5d --- tasks/repo_sync_manager.yml | 10 +++++----- vars/debian.yml | 3 +++ vars/redhat.yml | 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tasks/repo_sync_manager.yml b/tasks/repo_sync_manager.yml index 72b4b6c..8cce69a 100644 --- a/tasks/repo_sync_manager.yml +++ b/tasks/repo_sync_manager.yml @@ -13,17 +13,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -- name: Drop lsyncd configuration file +- name: Deploy lsyncd configuration file template: src: "{{ item.src }}" dest: "{{ item.dest }}" with_items: - - { src: "lsyncd.lua.j2", dest: "/etc/lsyncd/lsyncd.conf.lua" } - - { src: "lsyncd.defaults.j2", dest: "/etc/default/lsyncd" } + - { src: "lsyncd.lua.j2", dest: "{{ repo_lsyncd_config_file }}" } + - { src: "lsyncd.defaults.j2", dest: "{{ repo_lsyncd_defaults_file }}" } notify: - reload lsyncd - when: > - groups['repo_all']|length > 1 + when: + - groups['repo_all']|length > 1 tags: - repo-lsyncd - repo-config diff --git a/vars/debian.yml b/vars/debian.yml index ef78ebe..4103a12 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -26,3 +26,6 @@ repo_server_distro_packages: repo_pkg_cache_server_distro_packages: - apt-cacher-ng + +repo_lsyncd_config_file: /etc/lsyncd/lsyncd.conf.lua +repo_lsyncd_defaults_file: /etc/default/lsyncd diff --git a/vars/redhat.yml b/vars/redhat.yml index 8546089..5e03105 100644 --- a/vars/redhat.yml +++ b/vars/redhat.yml @@ -27,3 +27,5 @@ repo_server_distro_packages: repo_pkg_cache_server_distro_packages: - apt-cacher-ng +repo_lsyncd_config_file: /etc/lsyncd.conf +repo_lsyncd_defaults_file: /etc/sysconfig/lsyncd