- Removed add_tls_cert, wasn't used.

- Moved collectd to a seperate role.

README.rst

@@ -21,10 +21,6 @@ Role Variables
     backports: False # To enable Debian backports repos.
     ssh_ca: # TBD.
     syslog_server: # The address of syslog server to forward.
-    collectd_graphite_server:
-    collectd_riemann_server:
-    collectd_collectd_server:
-    collectd_statsd_server:
     tls_cert: # Filename of the TLS cert for that host.
     tls_key: # Filename of the TLS key for that host.
     tls_ca_cert: #Filename of the TLS CA cert for that host.

defaults/main.yml

 ---
 # defaults file for ansible-common
-
-extra_tls_certs: []

files/collectd.conf

-AutoLoadPlugin true
-FQDNLookup false
-<Plugin syslog>
-        LogLevel info
-</Plugin>
-<Include "/etc/collectd/collectd.conf.d">
-        Filter "*.conf"
-</Include>

handlers/main.yml

@@ -13,8 +13,3 @@
   service:
     name: syslogd
     state: restarted
-
-- name: Restart Collectd
-  service:
-    name: collectd
-    state: restarted

tasks/add_tls_cert.yml

----
-
-- name: Assert
-  assert:
-    that:
-    - "ansible_os_family in [ 'Debian', 'OpenBSD' ]"
-    - "extra_tls_certs is defined"
-
-- name: apt install CA certificates
-  when: ansible_pkg_mgr == 'apt'
-  apt:
-    name: ca-certificates
-    state: present
-    update_cache: yes
-    cache_valid_time: 3600
-
-- name: Add TLS cert
-  with_items: extra_tls_certs
-  when: ansible_os_family == 'Debian'
-  copy:
-    src: '{{ item }}'
-    dest: '{{ cert_dir[ansible_os_family] }}/{{ item|basename }}.crt'
-    owner: root
-    group: 0
-    mode: 0o0644
-  notify:
-  - Update CA store

tasks/collectd_agent.yml

----
-
-- name: Assert
-  assert:
-    that: ansible_os_family in [ 'Debian', 'OpenBSD' ]
-
-- name: apt install Collectd
-  when: ansible_pkg_mgr == 'apt'
-  apt:
-    name: collectd
-    install_recommends: no
-    state: present
-    update_cache: yes
-    cache_valid_time: 3600
-
-- name: pkg install Collectd
-  when: ansible_pkg_mgr == 'openbsd_pkg'
-  openbsd_pkg:
-    name: '{{ openbsd_collectd_version[ansible_distribution_release] }}'
-    state: present
-
-- name: Create configuration directory
-  file:
-    path: /etc/collectd/collectd.conf.d/
-    owner: root
-    group: 0
-    mode: 0o0755
-    state: directory
-
-- name: Gather Collectd facts
-  collectd_facts:
-
-- name: Base Collectd configuration
-  copy:
-    src: collectd.conf
-    dest: /etc/collectd/collectd.conf
-    owner: root
-    group: 0
-    mode: 0o0644
-  notify:
-  - Restart Collectd
-
-- name: Default Collectd configuration
-  with_fileglob:
-  - template/collectd/*.j2
-  template:
-    src: '{{ item }}'
-    dest: /etc/collectd/collectd.conf.d/
-    owner: root
-    group: 0
-    mode: 0o0644
-  notify:
-  - Restart Collectd
-
-- name: Enabled Collectd service
-  service:
-    name: collectd
-    state: started
-    enabled: yes

tasks/main.yml

@@ -11,14 +11,8 @@
 - include: tls_cert.yml
   when: tls_cert|default(True) and not common_role_finished is defined
 
-- include: add_tls_cert.yml
-  when: not common_role_finished is defined
-
 - include: syslog_forward.yml
   when: syslog_server is defined and not common_role_finished is defined
 
-- include: collectd_agent.yml
-  when: (collectd_graphite_server is defined or collectd_riemann_server is defined or collectd_collectd_server is defined or collectd_statsd_server is defined) and not common_role_finished is defined
-
 - set_fact:
     common_role_finished: True

templates/collectd/write.conf.j2

-{% if collectd_collectd_server is defined %}
-
-{% elif collectd_riemann_server is defined and (collectd['major'] > 5 or
-(collectd['major'] == 5 and collectd['minor'] >= 3)) %}
-
-{% elif collectd_graphite_server is defined and (collectd['major'] > 5 or
-(collectd['major'] == 5 and collectd['minor'] >= 1)) %}
-
-{% endif %}

vars/main.yml

@@ -15,12 +15,6 @@ backports_repo:
   precise: http://archive.ubuntu.com/ubuntu precise-backports main universe multiverse
   trusty: http://archive.ubuntu.com/ubuntu trusty-backports main universe multiverse
 
-openbsd_collectd_version:
-    '5.5': 'collectd-4.10.2p4'
-    '5.6': 'collectd-4.10.2p4'
-    '5.7': 'collectd-5.4.1p1'
-    '5.8': 'collectd-5.5.0p1'
-
 ca_store:
     OpenBSD: /etc/ssl/cert.pem
     Debian: /etc/ssl/certs/ca-certificates.crt