Fix grains template formating
This patch fixes keystone.metadata.salt.yml formatting.
After rendering the yml is not valid http://paste.openstack.org/show/609272/
Change-Id: Ia221c598f0d1415c305f431025f8b341f3d43ce0
diff --git a/keystone/meta/salt.yml b/keystone/meta/salt.yml
index 8961ec1..99c3759 100644
--- a/keystone/meta/salt.yml
+++ b/keystone/meta/salt.yml
@@ -8,14 +8,14 @@
priority: 520
minion:
- {% if pillar.keystone.server is defined or pillar.keystone.client is defined %}
+ {%- if pillar.keystone.server is defined or pillar.keystone.client is defined %}
keystone:
- {%- if pillar.keystone.get('server', {'enabled': False}).enabled -%}
- {%- from "keystone/map.jinja" import server with context -%}
+ {%- if pillar.keystone.get('server', {'enabled': False}).enabled %}
+ {%- from "keystone/map.jinja" import server with context %}
keystone.token: '{{ server.service_token }}'
keystone.endpoint: 'http://{{ server.bind.address }}:{{ server.bind.private_port }}/v2.0'
- {%- else -%}
- {%- from "keystone/map.jinja" import client with context -%}
+ {%- else %}
+ {%- from "keystone/map.jinja" import client with context %}
keystone.user: '{{ client.server.user }}'
keystone.password: '{{ client.server.password }}'
keystone.tenant: '{{ client.server.tenant }}'