Merge pull request #10 from tcpcloud/keystone_fix

Keystone fix

salt/files/minion.conf

@@ -128,16 +128,6 @@ gitlab.token: '{{ pillar.gitlab.server.get('token', 'Set token in pillar') }}'
 {%- 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", []) %}