From 9d8d0776d7deb674d3c6de2a6e4acafd135e2edd Mon Sep 17 00:00:00 2001 From: Patrick Marchand Date: Thu, 4 Jul 2019 20:02:24 -0400 Subject: [PATCH] Adds ubuntu condition checks to evomaintenance role. Installs the evomaintenance package with a .deb for now. --- .../tasks/install_package_ubuntu.yml | 18 ++++++++++++++++++ evomaintenance/tasks/main.yml | 11 ++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 evomaintenance/tasks/install_package_ubuntu.yml diff --git a/evomaintenance/tasks/install_package_ubuntu.yml b/evomaintenance/tasks/install_package_ubuntu.yml new file mode 100644 index 00000000..5b6664fc --- /dev/null +++ b/evomaintenance/tasks/install_package_ubuntu.yml @@ -0,0 +1,18 @@ +--- + +- name: Package is installed + apt: + deb: 'http://pub.evolix.net/stretch/evomaintenance_0.2.9-1_all.deb' + tags: + - evomaintenance + +- name: Configuration is installed + template: + src: evomaintenance.j2 + dest: /etc/evomaintenance.cf + owner: root + group: root + mode: "0600" + force: "{{ evomaintenance_force_config | bool }}" + tags: + - evomaintenance diff --git a/evomaintenance/tasks/main.yml b/evomaintenance/tasks/main.yml index 6d2cd26c..e9e22007 100644 --- a/evomaintenance/tasks/main.yml +++ b/evomaintenance/tasks/main.yml @@ -9,15 +9,20 @@ - evomaintenance_api_key is not none msg: evomaintenance api variables must be set +- include: install_package_ubuntu.yml + when: + - not evomaintenance_install_vendor + - ansible_distribution == "Ubuntu" + - include: install_package_debian.yml when: - not evomaintenance_install_vendor - - ansible_distribution == "Debian" + - ansible_distribution == "Debian" or ansible_distribution == "Ubuntu" - include: install_vendor_debian.yml when: - evomaintenance_install_vendor - - ansible_distribution == "Debian" + - ansible_distribution == "Debian" or ansible_distribution == "Ubuntu" - include: install_vendor_openbsd.yml when: @@ -25,4 +30,4 @@ - include: minifirewall.yml when: - - ansible_distribution == "Debian" + - ansible_distribution == "Debian" or ansible_distribution == "Ubuntu"