Fix tests
Change-Id: I3b67fc2d41591d2861e3115742b587b2cd63647c
diff --git a/collectd/_common.sls b/collectd/_common.sls
index 7725520..2480e30 100644
--- a/collectd/_common.sls
+++ b/collectd/_common.sls
@@ -25,10 +25,3 @@
/usr/lib/collectd-python:
file.recurse:
- source: salt://collectd/files/plugin
-
-collectd_client_grains_dir:
- file.directory:
- - name: /etc/salt/grains.d
- - mode: 700
- - makedirs: true
- - user: root
diff --git a/collectd/client.sls b/collectd/client.sls
index 4e07754..55be5cb 100644
--- a/collectd/client.sls
+++ b/collectd/client.sls
@@ -14,7 +14,7 @@
{%- set service_grains = {'collectd': {'remote_plugin': {}, 'local_plugin': {}}} %}
-{%- for service_name in salt['pillar.ls']()|sort %}
+{%- for service_name in pillar.keys()|sort %}
{%- set service = salt['pillar.items'](service_name)[service_name] %}
{%- if service.get('_support', {}).get('collectd', {}).get('enabled', False) %}
{%- set grains_fragment_file = service_name+'/meta/collectd.yml' %}
diff --git a/collectd/meta/salt.yml b/collectd/meta/salt.yml
index c85972e..7266f7f 100644
--- a/collectd/meta/salt.yml
+++ b/collectd/meta/salt.yml
@@ -2,7 +2,7 @@
{%- if pillar.collectd.client is defined %}
{%- set service_grains = {'collectd': {'remote_plugin': {}, 'local_plugin': {}}} %}
- {%- for service_name in salt['pillar.ls']()|sort %}
+ {%- for service_name in pillar.keys|sort %}
{%- set service = salt['pillar.items'](service_name)[service_name] %}
{%- if service.get('_support', {}).get('collectd', {}).get('enabled', False) %}
{%- set grains_fragment_file = service_name+'/meta/collectd.yml' %}