diff --git a/opencontrail/config.sls b/opencontrail/config.sls
index d580a1e..e6a9bed 100644
--- a/opencontrail/config.sls
+++ b/opencontrail/config.sls
@@ -148,13 +148,10 @@
   - source: salt://opencontrail/files/{{ config.version }}/contrail-config-nodemgr.conf
   - template: jinja
 
-
-{%- if config.identity.engine == "keystone" %}
 /etc/contrail/contrail-keystone-auth.conf:
   file.managed:
   - source: salt://opencontrail/files/{{ config.version }}/contrail-keystone-auth.conf
   - template: jinja
-{%- endif %}
 
 /etc/contrail/contrail-schema.conf:
   file.managed:
diff --git a/opencontrail/files/4.0/contrail-keystone-auth.conf b/opencontrail/files/4.0/contrail-keystone-auth.conf
index 4c32311..f3aeb94 100644
--- a/opencontrail/files/4.0/contrail-keystone-auth.conf
+++ b/opencontrail/files/4.0/contrail-keystone-auth.conf
@@ -1,7 +1,9 @@
 {%- from "opencontrail/map.jinja" import config with context -%}
-{%- if config.identity.engine != "none" %}
 
 [KEYSTONE]
+
+{%- if config.identity.engine != "none" %}
+
 auth_host={{ config.identity.host }}
 auth_protocol=http
 auth_port={{ config.identity.port }}