Various small changes for molecule

This commit is contained in:
Werner Dijkerman
2019-04-21 18:17:54 +02:00
parent 567539a637
commit a11694ff86
5 changed files with 17 additions and 14 deletions

View File

@ -4,6 +4,8 @@
telegraf_agent_version: 1.10.0 telegraf_agent_version: 1.10.0
telegraf_agent_version_patch: 1 telegraf_agent_version_patch: 1
telegraf_agent_package: telegraf telegraf_agent_package: telegraf
telegraf_agent_package_file_deb: telegraf_{{ telegraf_agent_version }}-{{ telegraf_agent_version_patch }}_{{ telegraf_agent_package_arch }}.deb
telegraf_agent_package_file_rpm: telegraf-{{ telegraf_agent_version }}-{{ telegraf_agent_version_patch }}.{{ ansible_architecture }}.rpm
telegraf_agent_package_path: /tmp telegraf_agent_package_path: /tmp
telegraf_agent_package_method: repo telegraf_agent_package_method: repo
telegraf_agent_package_state: present telegraf_agent_package_state: present

View File

@ -6,15 +6,15 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('telegraf') os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('telegraf')
def test_telegraf_running_and_enabled(Service, SystemInfo): def test_telegraf_running_and_enabled(host):
telegraf = Service("telegraf") telegraf = host.service("telegraf")
if SystemInfo.distribution not in ['opensuse-leap']: if host.system_info.distribution not in ['opensuse-leap']:
assert telegraf.is_enabled assert telegraf.is_enabled
assert telegraf.is_running assert telegraf.is_running
def test_telegraf_dot_conf(File): def test_telegraf_dot_conf(host):
telegraf = File("/etc/telegraf/telegraf.conf") telegraf = host.file("/etc/telegraf/telegraf.conf")
assert telegraf.user == "telegraf" assert telegraf.user == "telegraf"
assert telegraf.group == "telegraf" assert telegraf.group == "telegraf"
assert telegraf.mode == 0o640 assert telegraf.mode == 0o640
@ -26,16 +26,16 @@ def test_telegraf_dot_conf(File):
assert telegraf.contains('[[inputs.net]]') assert telegraf.contains('[[inputs.net]]')
def test_telegraf_dot_d_dir(File): def test_telegraf_dot_d_dir(host):
telegraf = File("/etc/telegraf/telegraf.d") telegraf = host.file("/etc/telegraf/telegraf.d")
assert telegraf.user == "root" assert telegraf.user == "root"
assert telegraf.group == "root" assert telegraf.group == "root"
assert telegraf.mode == 0o755 assert telegraf.mode == 0o755
assert telegraf.is_directory assert telegraf.is_directory
def test_telegraf_dot_d(File): def test_telegraf_dot_d(host):
telegraf = File("/etc/telegraf/telegraf.d/percpu-usage.conf") telegraf = host.file("/etc/telegraf/telegraf.d/percpu-usage.conf")
assert telegraf.user == "telegraf" assert telegraf.user == "telegraf"
assert telegraf.group == "telegraf" assert telegraf.group == "telegraf"
assert telegraf.mode == 0o640 assert telegraf.mode == 0o640
@ -43,6 +43,6 @@ def test_telegraf_dot_d(File):
assert telegraf.contains('totalcpu = false') assert telegraf.contains('totalcpu = false')
def test_telegraf_package(Package): def test_telegraf_package(host):
telegraf = Package('telegraf') telegraf = host.package('telegraf')
assert telegraf.is_installed assert telegraf.is_installed

View File

@ -65,7 +65,7 @@
- name: "Debian | Download Telegraf package (online)" - name: "Debian | Download Telegraf package (online)"
get_url: get_url:
url: https://dl.influxdata.com/telegraf/releases/telegraf_{{ telegraf_agent_version }}-{{ telegraf_agent_version_patch }}_{{ telegraf_agent_package_arch }}.deb url: https://dl.influxdata.com/telegraf/releases/{{ telegraf_agent_package_file_deb }}
dest: "{{ telegraf_agent_package }}" dest: "{{ telegraf_agent_package }}"
when: when:
- telegraf_agent_package_method == "online" - telegraf_agent_package_method == "online"

View File

@ -10,7 +10,8 @@
- name: Use RHEL 7 packages for Fedora - name: Use RHEL 7 packages for Fedora
set_fact: set_fact:
telegraf_redhat_releasever: 7 telegraf_redhat_releasever: 7
when: ansible_distribution == "Fedora" when:
- ansible_distribution == "Fedora"
- name: "RedHat | Add yum repository" - name: "RedHat | Add yum repository"
yum_repository: yum_repository:
@ -24,7 +25,7 @@
- name: "RedHat | Download Telegraf package (online)" - name: "RedHat | Download Telegraf package (online)"
get_url: get_url:
url: https://dl.influxdata.com/telegraf/releases/telegraf-{{ telegraf_agent_version }}-{{ telegraf_agent_version_patch }}.{{ ansible_architecture }}.rpm url: https://dl.influxdata.com/telegraf/releases/{{ telegraf_agent_package_file_rpm }}
dest: "{{ telegraf_agent_package }}" dest: "{{ telegraf_agent_package }}"
when: when:
- telegraf_agent_package_method == "online" - telegraf_agent_package_method == "online"