diff --git a/opencontrail/client.sls b/opencontrail/client.sls
index a2206c5..0768fd8 100644
--- a/opencontrail/client.sls
+++ b/opencontrail/client.sls
@@ -6,7 +6,6 @@
   - names: {{ client.pkgs }}
 
 {%- if not pillar.opencontrail.config is defined %}
-{%- if client.identity.engine == "keystone" %}
 /etc/contrail/vnc_api_lib.ini:
   file.managed:
   - source: salt://opencontrail/files/{{ client.version }}/client_vnc_api_lib.ini
@@ -14,7 +13,6 @@
   - require:
     - pkg: opencontrail_client_packages
 {%- endif %}
-{%- endif %}
 
 {%- if client.global_system_config is defined %}
 global_system_config_create:
diff --git a/opencontrail/files/4.0/client_vnc_api_lib.ini b/opencontrail/files/4.0/client_vnc_api_lib.ini
index 40bfbb3..fac3c79 100644
--- a/opencontrail/files/4.0/client_vnc_api_lib.ini
+++ b/opencontrail/files/4.0/client_vnc_api_lib.ini
@@ -9,6 +9,7 @@
 ;BASE_URL = /tenants/infra ; common-prefix for all URLs
 
 ; Authentication settings (optional)
+{%- if client.identity.engine == "keystone" %}
 [auth]
 AUTHN_TYPE = keystone
 AUTHN_PROTOCOL = http
@@ -18,3 +19,4 @@
 AUTHN_USER = {{ client.identity.user }}
 AUTHN_PASSWORD = {{ client.identity.password }}
 AUTHN_URL = /v2.0/tokens
+{%- endif %}