Merge pull request #8 from elemoine/data
Require reclass_data_dir
diff --git a/salt/files/minion.conf b/salt/files/minion.conf
index 1323b2f..780c4bc 100644
--- a/salt/files/minion.conf
+++ b/salt/files/minion.conf
@@ -128,16 +128,6 @@
{%- if pillar.get('keystone', {}).get('server', {'enabled': False } ).enabled %}
keystone.token: '{{ pillar.keystone.server.service_token }}'
keystone.endpoint: 'http://{{ pillar.keystone.server.bind.private_address }}:{{ pillar.keystone.server.bind.private_port }}/v2.0'
-{%- elif pillar.get('keystone', {}).get('client', {'enabled': False } ).enabled %}
-{%- if pillar.keystone.client.server.service_token is defined %}
-keystone.token: '{{ pillar.keystone.client.server.service_token }}'
-keystone.endpoint: 'http://{{ pillar.keystone.client.server.host }}:{{ pillar.keystone.client.server.private_port }}/v2.0'
-{%- else %}
-keystone.user: '{{ pillar.keystone.client.server.user }}'
-keystone.password: '{{ pillar.keystone.client.server.password }}'
-keystone.tenant: '{{ pillar.keystone.client.server.tenant }}'
-keystone.auth_url: 'http://{{ pillar.keystone.client.server.host }}:{{ pillar.keystone.client.server.public_port }}/v2.0/'
-{%- endif %}
{%- endif %}
{%- for handler in pillar.salt.minion.get("handlers", []) %}
diff --git a/salt/master/service.sls b/salt/master/service.sls
index cba4f2c..3ca6d1c 100644
--- a/salt/master/service.sls
+++ b/salt/master/service.sls
@@ -28,7 +28,7 @@
- watch_in:
- service: salt_master_service
-{%- if master.peer is defined %}
+{%- if master.user is defined %}
/etc/salt/master.d/_acl.conf:
file.managed:
@@ -40,6 +40,10 @@
- watch_in:
- service: salt_master_service
+{%- endif %}
+
+{%- if master.peer is defined %}
+
/etc/salt/master.d/_peer.conf:
file.managed:
- source: salt://salt/files/_peer.conf
@@ -50,7 +54,6 @@
- watch_in:
- service: salt_master_service
-
{%- endif %}
salt_master_service: