Manage minion.d using support metadata
Change-Id: If140072753febaa7fc3023b84185925da4da7b23
diff --git a/openldap/client.sls b/openldap/client.sls
index daff5d8..e7cd3f3 100644
--- a/openldap/client.sls
+++ b/openldap/client.sls
@@ -6,11 +6,6 @@
pkg.installed:
- names: {{ client.pkgs }}
-/etc/salt/minion.d/_ldap.conf:
- file.managed:
- - source: salt://openldap/files/_ldap.conf
- - template: jinja
-
{%- if client.entry is defined %}
{%- macro process_entry(entry, tree) %}
diff --git a/openldap/files/_ldap.conf b/openldap/files/_ldap.conf
deleted file mode 100644
index 835364c..0000000
--- a/openldap/files/_ldap.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-{%- from "openldap/map.jinja" import client with context -%}
-{%- if client.server is defined %}
-ldap:
- server: {{ client.server.host }}
- tls: {{ client.server.tls|default(False) }}
- port: {{ client.server.port|default(389) }}
- basedn: {{ client.server.basedn }}
- {%- if client.server.auth is defined %}
- binddn: {{ client.server.auth.user }}
- bindpw: {{ client.server.auth.password }}
- {%- endif %}
-
-ldap3:
- url: ldap://{{ client.server.host }}{% if client.server.port is defined %}:{{ client.server.port }}{% endif %}
- {%- if client.server.auth is defined %}
- bind:
- method: simple
- dn: {{ client.server.auth.user }}
- password: {{ client.server.auth.password }}
- {%- endif %}
- {%- if client.server.tls is defined %}
- tls:
- starttls: true
- {%- endif %}
-{%- endif %}
-
-{#-
- vim: syntax=jinja
--#}
diff --git a/openldap/meta/salt.yml b/openldap/meta/salt.yml
new file mode 100644
index 0000000..92f7534
--- /dev/null
+++ b/openldap/meta/salt.yml
@@ -0,0 +1,33 @@
+minion:
+ {%- if pillar.openldap.client is defined %}
+ {%- from "openldap/map.jinja" import client with context -%}
+ {%- if client.server is defined %}
+ ldap:
+ ldap:
+ server: {{ client.server.host }}
+ tls: {{ client.server.tls|default(False) }}
+ port: {{ client.server.port|default(389) }}
+ basedn: {{ client.server.basedn }}
+ {%- if client.server.auth is defined %}
+ binddn: {{ client.server.auth.user }}
+ bindpw: {{ client.server.auth.password }}
+ {%- endif %}
+
+ ldap3:
+ url: ldap://{{ client.server.host }}{% if client.server.port is defined %}:{{ client.server.port }}{% endif %}
+ {%- if client.server.auth is defined %}
+ bind:
+ method: simple
+ dn: {{ client.server.auth.user }}
+ password: {{ client.server.auth.password }}
+ {%- endif %}
+ {%- if client.server.tls is defined %}
+ tls:
+ starttls: true
+ {%- endif %}
+ {%- endif %}
+ {%- endif %}
+
+{#-
+ vim: syntax=jinja
+-#}