Merge "Add support to configure PostgreSQL as DataSource"
diff --git a/rundeck/client/init.sls b/rundeck/client/init.sls
index e0c7eff..63c8c04 100644
--- a/rundeck/client/init.sls
+++ b/rundeck/client/init.sls
@@ -6,8 +6,3 @@
- rundeck.client.project
{%- endif %}
{%- endif %}
-
-/etc/salt/minion.d/_rundeck.conf:
- file.managed:
- - source: salt://rundeck/files/_rundeck.conf
- - template: jinja
diff --git a/rundeck/meta/salt.yml b/rundeck/meta/salt.yml
new file mode 100644
index 0000000..6c66279
--- /dev/null
+++ b/rundeck/meta/salt.yml
@@ -0,0 +1,14 @@
+minion:
+ {%- if pillar.rundeck.client is defined %}
+ rundeck:
+ {%- from "rundeck/map.jinja" import client with context %}
+ {%- from "rundeck/map.jinja" import make_url with context %}
+ {%- set creds = client.server.credentials %}
+ rundeck.url: "{{ make_url(client.server.endpoint) }}"
+ {%- if creds.api_token is defined %}
+ rundeck.api_token: "{{ creds.api_token }}"
+ {%- else %}
+ rundeck.username: "{{ creds.username }}"
+ rundeck.password: "{{ creds.password }}"
+ {%- endif %}
+ {%- endif %}