Fix libvirt environment file name

In Pike with libvirt 3.6, environment file should be /etc/default/libvirtd

Change-Id: I196dd78a6134f1c5a71eb6b8423453891359be91
Related-Prod: PROD-17203
diff --git a/nova/map.jinja b/nova/map.jinja
index cbae33f..03b509f 100644
--- a/nova/map.jinja
+++ b/nova/map.jinja
@@ -115,7 +115,12 @@
   services:
   - nova-compute
   libvirt_config: libvirtd.conf
+  {# Since Openstack Pike Libvirt 3.6 package is installed, it requires different file name for environment file #}
+  {%- if pillar.nova.compute is defined and pillar.nova.compute.version not in ["juno", "kilo", "liberty", "mitaka", "newton", "ocata"] %}
+  libvirt_bin: "/etc/default/libvirtd"
+  {%- else %}
   libvirt_bin: "/etc/default/libvirt-bin"
+  {%- endif %}
   libvirt_service: libvirt-bin
   bind: compute_bind_defaults
   debug: false