Fix generation of profiled grains
Generation of profilde grains [0] were lost by [1]
This patch restores mentioned functionality.
Also drop keystone/files/keystone.conf as it is not
used anywhere.
[0] https://gerrit.mcp.mirantis.net/gitweb?p=salt-formulas/keystone.git;a=blob_plain;f=keystone/files/keystone.conf;h=e6c9de2268842dc1fc4e5713e03c75d5e6bc9323;hb=8703129f0024c4b057680defcf0dc612ba96865a
[1] https://gerrit.mcp.mirantis.net/#/c/4319/
Change-Id: I1ec2be2660e976278ad82f809372b03afdc48a07
diff --git a/keystone/files/keystone.conf b/keystone/files/keystone.conf
deleted file mode 100644
index e6c9de2..0000000
--- a/keystone/files/keystone.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-{%- from "keystone/map.jinja" import client with context %}
-{%- for profile_name, identity in client.server.iteritems() %}
-
-{%- if identity.admin.get('protocol', 'http') == 'http' %}
-{%- set protocol = 'http' %}
-{%- else %}
-{%- set protocol = 'https' %}
-{%- endif %}
-
-{%- if identity.admin.get('api_version', '2') == '3' %}
-{%- set version = "v3" %}
-{%- else %}
-{%- set version = "v2.0" %}
-{%- endif %}
-
-{%- if identity.admin.user is defined %}
-
-{%- if identity.admin.token is not defined %}
-
-{{ profile_name }}:
- keystone.user: '{{ identity.admin.user }}'
- keystone.password: '{{ identity.admin.password }}'
- keystone.tenant: '{{ identity.admin.project }}'
- keystone.auth_url: '{{ protocol+'://'+identity.admin.host+':'+identity.admin.port|string+'/'+version }}'
- keystone.region_name: '{{ identity.admin.region_name }}'
-
-{%- endif %}
-
-{%- endif %}
-
-{%- endfor %}
diff --git a/keystone/meta/salt.yml b/keystone/meta/salt.yml
index 99c3759..0be0720 100644
--- a/keystone/meta/salt.yml
+++ b/keystone/meta/salt.yml
@@ -21,6 +21,37 @@
keystone.tenant: '{{ client.server.tenant }}'
keystone.auth_url: 'http://{{ client.server.host }}:{{ client.server.public_port }}/v2.0/'
{%- endif %}
+
+ # Profile based metadata
+ {%- from "keystone/map.jinja" import client with context %}
+ {%- for profile_name, identity in client.server.iteritems() %}
+
+ {%- if identity.admin.get('protocol', 'http') == 'http' %}
+ {%- set protocol = 'http' %}
+ {%- else %}
+ {%- set protocol = 'https' %}
+ {%- endif %}
+
+ {%- if identity.admin.get('api_version', '2') == '3' %}
+ {%- set version = "v3" %}
+ {%- else %}
+ {%- set version = "v2.0" %}
+ {%- endif %}
+
+ {%- if identity.admin.user is defined %}
+ {%- if identity.admin.token is not defined %}
+
+ {{ profile_name }}:
+ keystone.user: '{{ identity.admin.user }}'
+ keystone.password: '{{ identity.admin.password }}'
+ keystone.tenant: '{{ identity.admin.project }}'
+ keystone.auth_url: '{{ protocol+'://'+identity.admin.host+':'+identity.admin.port|string+'/'+version }}'
+ keystone.region_name: '{{ identity.admin.region_name }}'
+
+ {%- endif %}
+ {%- endif %}
+ {%- endfor %}
+
{%- endif %}
{#-