diff --git a/nova/compute.sls b/nova/compute.sls
index 356cb29..f6a68fb 100644
--- a/nova/compute.sls
+++ b/nova/compute.sls
@@ -99,18 +99,6 @@
 
 {%- if pillar.nova.controller is not defined %}
 
-{%- if compute.get('networking', 'default') == "contrail" %}
-
-
-/etc/nova/nova.conf:
-  file.managed:
-  - source: salt://nova/files/{{ compute.version }}/nova-compute.conf.contrail.{{ grains.os_family }}
-  - template: jinja
-  - require:
-    - pkg: nova_compute_packages
-
-{%- else %}
-
 /etc/nova/nova.conf:
   file.managed:
   - source: salt://nova/files/{{ compute.version }}/nova-compute.conf.{{ grains.os_family }}
@@ -118,8 +106,6 @@
   - require:
     - pkg: nova_compute_packages
 
-{%- endif %}
-
 nova_compute_services:
   service.running:
   - enable: true
@@ -156,9 +142,9 @@
 
 {% endif %}
 
-/etc/default/libvirt-bin:
+{{ compute.libvirt_bin }}:
   file.managed:
-  - source: salt://nova/files/{{ compute.version }}/libvirt-bin
+  - source: salt://nova/files/{{ compute.version }}/libvirt.{{ grains.os_family }}
   - template: jinja
   - require:
     - pkg: nova_compute_packages
@@ -170,7 +156,7 @@
   - require:
     - pkg: nova_compute_packages
 
-/etc/libvirt/libvirtd.conf:
+/etc/libvirt/{{ compute.libvirt_config }}:
   file.managed:
   - source: salt://nova/files/{{ compute.version }}/libvirtd.conf.{{ grains.os_family }}
   - template: jinja
@@ -184,15 +170,15 @@
     - pkg: nova_compute_packages
   - onlyif: "virsh net-list | grep default"
 
-libvirt-bin:
+{{ compute.libvirt_service }}:
   service.running:
   - enable: true
   - require:
     - pkg: nova_compute_packages
     - cmd: virsh net-undefine default
   - watch:
-    - file: /etc/libvirt/libvirtd.conf
-    - file: /etc/default/libvirt-bin
+    - file: /etc/libvirt/{{ compute.libvirt_config }}
+    - file: {{ compute.libvirt_bin }}
 
 {%- endif %}
 
diff --git a/nova/controller.sls b/nova/controller.sls
index 91236a9..8028ee1 100644
--- a/nova/controller.sls
+++ b/nova/controller.sls
@@ -27,7 +27,7 @@
       - user: user_nova
 {%- endif %}
 
-{%- if controller.get('networking', 'default') == "contrail" %}
+{%- if controller.get('networking', 'default') == "contrail" and controller.version == "juno" %}
 
 contrail_nova_packages:
   pkg.installed:
@@ -35,24 +35,15 @@
     - contrail-nova-driver
     - contrail-nova-networkapi
 
-/etc/nova/nova.conf:
-  file.managed:
-  - source: salt://nova/files/{{ controller.version }}/nova-controller.conf.{{ grains.os_family }}
-  - template: jinja
-  - require:
-    - pkg: nova_controller_packages
-
-{%- else %}
-
-/etc/nova/nova.conf:
-  file.managed:
-  - source: salt://nova/files/{{ controller.version }}/nova-controller.conf.{{ grains.os_family }}
-  - template: jinja
-  - require:
-    - pkg: nova_controller_packages
-
 {%- endif %}
 
+/etc/nova/nova.conf:
+  file.managed:
+  - source: salt://nova/files/{{ controller.version }}/nova-controller.conf.{{ grains.os_family }}
+  - template: jinja
+  - require:
+    - pkg: nova_controller_packages
+
 /etc/nova/api-paste.ini:
   file.managed:
   - source: salt://nova/files/{{ controller.version }}/api-paste.ini.{{ grains.os_family }}
diff --git a/nova/files/juno/api-paste.ini.RedHat b/nova/files/juno/api-paste.ini.RedHat
new file mode 120000
index 0000000..08fd76a
--- /dev/null
+++ b/nova/files/juno/api-paste.ini.RedHat
@@ -0,0 +1 @@
+api-paste.ini.Debian
\ No newline at end of file
diff --git a/nova/files/juno/libvirt-bin b/nova/files/juno/libvirt.Debian
similarity index 100%
rename from nova/files/juno/libvirt-bin
rename to nova/files/juno/libvirt.Debian
diff --git a/nova/files/juno/libvirt.RedHat b/nova/files/juno/libvirt.RedHat
new file mode 120000
index 0000000..f8f6638
--- /dev/null
+++ b/nova/files/juno/libvirt.RedHat
@@ -0,0 +1 @@
+libvirt.Debian
\ No newline at end of file
diff --git a/nova/files/juno/libvirtd.conf.RedHat b/nova/files/juno/libvirtd.conf.RedHat
new file mode 120000
index 0000000..2a7b101
--- /dev/null
+++ b/nova/files/juno/libvirtd.conf.RedHat
@@ -0,0 +1 @@
+libvirtd.conf.Debian
\ No newline at end of file
diff --git a/nova/files/juno/nova-compute.conf.Debian b/nova/files/juno/nova-compute.conf.Debian
index a797084..08e5e10 100644
--- a/nova/files/juno/nova-compute.conf.Debian
+++ b/nova/files/juno/nova-compute.conf.Debian
@@ -1,60 +1,42 @@
-{%- set nova = pillar.nova.compute %}
 {%- from "nova/map.jinja" import compute with context %}
 [DEFAULT]
-logdir = /var/log/nova
-state_path = /var/lib/nova
-lock_path = /var/lib/nova/tmp
-volumes_dir = /etc/nova/volumes
-dhcpbridge = /usr/bin/nova-dhcpbridge
-dhcpbridge_flagfile = /etc/nova/nova.conf
-force_dhcp_release = True
-injected_network_template = /usr/share/nova/interfaces.template
-libvirt_nonblocking = True
-libvirt_use_virtio_for_bridges=True
-libvirt_inject_partition = -1
-sql_connection = {{ nova.database.engine }}://{{ nova.database.user }}:{{ nova.database.password }}@{{ nova.database.host }}/{{ nova.database.name }}
-compute_driver = libvirt.LibvirtDriver
-libvirt_type=kvm
-rootwrap_config = /etc/nova/rootwrap.conf
-auth_strategy = keystone
-firewall_driver=nova.virt.firewall.NoopFirewallDriver
-enabled_apis = ec2,osapi_compute,metadata
-my_ip= {{ compute.bind.vnc_address }}
-
+dhcpbridge_flagfile=/etc/nova/nova.conf
+dhcpbridge=/usr/bin/nova-dhcpbridge
 logdir=/var/log/nova
+state_path=/var/lib/nova
+lock_path=/var/lock/nova
+force_dhcp_release=True
 iscsi_helper=tgtadm
+libvirt_use_virtio_for_bridges=True
 connection_type=libvirt
 root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
-ec2_private_dns_show_ip=True
+verbose=True
+ec2_private_dns_show_ip=False
 api_paste_config=/etc/nova/api-paste.ini
 volumes_path=/var/lib/nova/volumes
+enabled_apis=ec2,osapi_compute,metadata
 
-network_api_class = nova.network.neutronv2.api.API
+allow_resize_to_same_host=True
 
-#NoVNC
-vnc_enabled=true
-my_ip={{ compute.bind.vnc_address }}
-
-vncserver_proxyclient_address={{ compute.bind.vnc_address }}
-novncproxy_base_url={{ compute.vncproxy_url }}/vnc_auto.html
-novncproxy_port={{ nova.bind.vnc_port }}
-
-{%- if compute.cache is defined %}
-memcached_servers={%- for member in compute.cache.members %}{% if loop.index == 1 %}{{ member }}:11211{% endif %},{{ member }}:11211{%- endfor %}
+{%- if compute.reserved_host_memory_mb is defined %}
+reserved_host_memory_mb = {{ compute.reserved_host_memory_mb }}
 {%- endif %}
 
+live_migration_flag=VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE
+live_migration_retry_count=30
 
 #Neutron
-neutron_admin_username={{ pillar.neutron.switch.identity.user }}
-neutron_admin_password={{ pillar.neutron.switch.identity.password }}
-neutron_admin_tenant_name={{ pillar.neutron.switch.identity.tenant }}
-neutron_admin_auth_url=http://{{ pillar.neutron.switch.identity.host }}:{{ pillar.neutron.switch.identity.port }}/v2.0
+neutron_admin_username={{ compute.network.user }}
+neutron_admin_password={{ compute.network.password }}
+neutron_admin_tenant_name={{ compute.identity.tenant }}
+neutron_admin_auth_url=http://{{ compute.identity.host }}:{{ compute.identity.port }}/v2.0
 neutron_url=http://{{ compute.network.host }}:{{ compute.network.port }}
+#neutron_url = http://10.0.102.35:9696/
 
-linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
-security_group_api = neutron
-rpc_backend = nova.rpc.impl_kombu
+
+auth_strategy = keystone
+libvirt_nonblocking = True
+libvirt_inject_partition = -1
 
 #RabbitMQ
 rabbit_host = {{ compute.message_queue.host }}
@@ -70,8 +52,47 @@
 use_cow_images = {{ compute.image.use_cow }}
 {%- endif %}
 
-live_migration_flag=VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE
-live_migration_retry_count=30
+neutron_url_timeout = 300
+network_api_class = nova_contrail_vif.contrailvif.ContrailNetworkAPI
+compute_driver = libvirt.LibvirtDriver
+
+heal_instance_info_cache_interval = {{ compute.heal_instance_info_cache_interval }}
+
+#NoVNC
+vnc_enabled=true
+vncserver_enabled = true
+vncserver_listen=0.0.0.0
+vncserver_proxyclient_address={{ compute.bind.vnc_address }}
+novncproxy_base_url={{ compute.vncproxy_url }}/vnc_auto.html
+novncproxy_port={{ compute.bind.vnc_port }}
+
+{%- if compute.cache is defined %}
+memcached_servers={%- for member in compute.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %}
+{%- endif %}
+
+security_group_api = neutron
+heal_instance_info_cache_interval = 0
+libvirt_cpu_mode = host-passthrough
+image_cache_manager_interval = 0
+libvirt_vif_driver = nova_contrail_vif.contrailvif.VRouterVIFDriver
+firewall_driver = nova.virt.firewall.NoopFirewallDriver
+glance_port = 9292
+glance_num_retries = 10
+
+rabbit_retry_interval = 1
+rabbit_retry_backoff = 2
+
+rpc_cast_timeout = 30
+rpc_conn_pool_size = 300
+rpc_response_timeout = 3600
+rpc_thread_pool_size = 70
+report_interval = 5
+
+block_device_allocate_retries=600
+block_device_allocate_retries_interval=10
+
+resume_guests_state_on_host_boot = True
+service_down_time = 90
 
 {% if pillar.ceilometer is defined %}
 
@@ -84,9 +105,12 @@
 
 {%- if compute.notification is defined %}
 notification_driver = {{ compute.notification.driver }}
-notification_topics = {{ compute.notification.topics }}
 
-{%- if compute.notification.notify_on %}
+{%- if compute.notification.topics is defined %}
+notification_topics = {{ compute.notification.topics }}
+{%- endif %}
+
+{%- if compute.notification.notify_on is defined %}
 {%- for key, value in compute.notification.notify_on.iteritems() %}
 notify_on_{{ key }} = {{ value }}
 {%- endfor %}
@@ -103,5 +127,3 @@
 auth_port = {{ compute.identity.port }}
 auth_protocol=http
 auth_uri=http://{{ compute.identity.host }}:5000
-
-
diff --git a/nova/files/juno/nova-compute.conf.Redhat b/nova/files/juno/nova-compute.conf.Redhat
new file mode 120000
index 0000000..ad4c8f6
--- /dev/null
+++ b/nova/files/juno/nova-compute.conf.Redhat
@@ -0,0 +1 @@
+nova-compute.conf.Debian
\ No newline at end of file
diff --git a/nova/files/juno/nova-compute.conf.contrail.Debian b/nova/files/juno/nova-compute.conf.contrail.Debian
deleted file mode 100644
index 08e5e10..0000000
--- a/nova/files/juno/nova-compute.conf.contrail.Debian
+++ /dev/null
@@ -1,129 +0,0 @@
-{%- from "nova/map.jinja" import compute with context %}
-[DEFAULT]
-dhcpbridge_flagfile=/etc/nova/nova.conf
-dhcpbridge=/usr/bin/nova-dhcpbridge
-logdir=/var/log/nova
-state_path=/var/lib/nova
-lock_path=/var/lock/nova
-force_dhcp_release=True
-iscsi_helper=tgtadm
-libvirt_use_virtio_for_bridges=True
-connection_type=libvirt
-root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
-verbose=True
-ec2_private_dns_show_ip=False
-api_paste_config=/etc/nova/api-paste.ini
-volumes_path=/var/lib/nova/volumes
-enabled_apis=ec2,osapi_compute,metadata
-
-allow_resize_to_same_host=True
-
-{%- if compute.reserved_host_memory_mb is defined %}
-reserved_host_memory_mb = {{ compute.reserved_host_memory_mb }}
-{%- endif %}
-
-live_migration_flag=VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE
-live_migration_retry_count=30
-
-#Neutron
-neutron_admin_username={{ compute.network.user }}
-neutron_admin_password={{ compute.network.password }}
-neutron_admin_tenant_name={{ compute.identity.tenant }}
-neutron_admin_auth_url=http://{{ compute.identity.host }}:{{ compute.identity.port }}/v2.0
-neutron_url=http://{{ compute.network.host }}:{{ compute.network.port }}
-#neutron_url = http://10.0.102.35:9696/
-
-
-auth_strategy = keystone
-libvirt_nonblocking = True
-libvirt_inject_partition = -1
-
-#RabbitMQ
-rabbit_host = {{ compute.message_queue.host }}
-rabbit_port = {{ compute.message_queue.port }}
-rabbit_hosts={{ compute.message_queue.host }}:{{ compute.message_queue.port }}
-rabbit_userid = {{ compute.message_queue.user }}
-rabbit_password = {{ compute.message_queue.password }}
-rabbit_virtual_host = {{ compute.message_queue.virtual_host }}
-
-glance_host = {{ compute.image.host }}
-
-{%- if compute.image.use_cow is defined %}
-use_cow_images = {{ compute.image.use_cow }}
-{%- endif %}
-
-neutron_url_timeout = 300
-network_api_class = nova_contrail_vif.contrailvif.ContrailNetworkAPI
-compute_driver = libvirt.LibvirtDriver
-
-heal_instance_info_cache_interval = {{ compute.heal_instance_info_cache_interval }}
-
-#NoVNC
-vnc_enabled=true
-vncserver_enabled = true
-vncserver_listen=0.0.0.0
-vncserver_proxyclient_address={{ compute.bind.vnc_address }}
-novncproxy_base_url={{ compute.vncproxy_url }}/vnc_auto.html
-novncproxy_port={{ compute.bind.vnc_port }}
-
-{%- if compute.cache is defined %}
-memcached_servers={%- for member in compute.cache.members %}{{ member.host }}:11211{% if not loop.last %},{% endif %}{%- endfor %}
-{%- endif %}
-
-security_group_api = neutron
-heal_instance_info_cache_interval = 0
-libvirt_cpu_mode = host-passthrough
-image_cache_manager_interval = 0
-libvirt_vif_driver = nova_contrail_vif.contrailvif.VRouterVIFDriver
-firewall_driver = nova.virt.firewall.NoopFirewallDriver
-glance_port = 9292
-glance_num_retries = 10
-
-rabbit_retry_interval = 1
-rabbit_retry_backoff = 2
-
-rpc_cast_timeout = 30
-rpc_conn_pool_size = 300
-rpc_response_timeout = 3600
-rpc_thread_pool_size = 70
-report_interval = 5
-
-block_device_allocate_retries=600
-block_device_allocate_retries_interval=10
-
-resume_guests_state_on_host_boot = True
-service_down_time = 90
-
-{% if pillar.ceilometer is defined %}
-
-instance_usage_audit = True
-instance_usage_audit_period = hour
-notify_on_state_change = vm_and_task_state
-notification_driver = messagingv2
-
-{% endif %}
-
-{%- if compute.notification is defined %}
-notification_driver = {{ compute.notification.driver }}
-
-{%- if compute.notification.topics is defined %}
-notification_topics = {{ compute.notification.topics }}
-{%- endif %}
-
-{%- if compute.notification.notify_on is defined %}
-{%- for key, value in compute.notification.notify_on.iteritems() %}
-notify_on_{{ key }} = {{ value }}
-{%- endfor %}
-{%- endif %}
-
-{%- endif %}
-
-[keystone_authtoken]
-signing_dirname=/tmp/keystone-signing-nova
-admin_tenant_name = {{ compute.identity.tenant }}
-admin_user = {{ compute.identity.user }}
-admin_password = {{ compute.identity.password }}
-auth_host = {{ compute.identity.host }}
-auth_port = {{ compute.identity.port }}
-auth_protocol=http
-auth_uri=http://{{ compute.identity.host }}:5000
diff --git a/nova/files/juno/nova-controller.conf.RedHat b/nova/files/juno/nova-controller.conf.RedHat
new file mode 120000
index 0000000..09c7524
--- /dev/null
+++ b/nova/files/juno/nova-controller.conf.RedHat
@@ -0,0 +1 @@
+nova-controller.conf.Debian
\ No newline at end of file
diff --git a/nova/files/juno/qemu.conf.RedHat b/nova/files/juno/qemu.conf.RedHat
new file mode 120000
index 0000000..1d23f19
--- /dev/null
+++ b/nova/files/juno/qemu.conf.RedHat
@@ -0,0 +1 @@
+qemu.conf.Debian
\ No newline at end of file
diff --git a/nova/files/kilo/api-paste.ini.RedHat b/nova/files/kilo/api-paste.ini.RedHat
new file mode 120000
index 0000000..08fd76a
--- /dev/null
+++ b/nova/files/kilo/api-paste.ini.RedHat
@@ -0,0 +1 @@
+api-paste.ini.Debian
\ No newline at end of file
diff --git a/nova/files/kilo/libvirt-bin b/nova/files/kilo/libvirt.Debian
similarity index 100%
rename from nova/files/kilo/libvirt-bin
rename to nova/files/kilo/libvirt.Debian
diff --git a/nova/files/kilo/libvirt.RedHat b/nova/files/kilo/libvirt.RedHat
new file mode 100644
index 0000000..0d42d81
--- /dev/null
+++ b/nova/files/kilo/libvirt.RedHat
@@ -0,0 +1,10 @@
+# Defaults for libvirt-bin initscript (/etc/init.d/libvirt-bin)
+# This is a POSIX shell fragment
+
+# Start libvirtd to handle qemu/kvm:
+start_libvirtd="yes"
+
+# options passed to libvirtd, add "-l" to listen on tcp
+libvirtd_opts="-d -l"
+# pass in location of kerberos keytab
+#export KRB5_KTNAME=/etc/libvirt/libvirt.keytab
diff --git a/nova/files/kilo/libvirtd.conf.RedHat b/nova/files/kilo/libvirtd.conf.RedHat
new file mode 120000
index 0000000..2a7b101
--- /dev/null
+++ b/nova/files/kilo/libvirtd.conf.RedHat
@@ -0,0 +1 @@
+libvirtd.conf.Debian
\ No newline at end of file
diff --git a/nova/files/kilo/nova-compute.conf.contrail.Debian b/nova/files/kilo/nova-compute.conf.Debian
similarity index 98%
rename from nova/files/kilo/nova-compute.conf.contrail.Debian
rename to nova/files/kilo/nova-compute.conf.Debian
index 29e738b..f5e0a2d 100644
--- a/nova/files/kilo/nova-compute.conf.contrail.Debian
+++ b/nova/files/kilo/nova-compute.conf.Debian
@@ -65,7 +65,6 @@
 heal_instance_info_cache_interval = 0
 libvirt_cpu_mode = host-passthrough
 image_cache_manager_interval = 0
-libvirt_vif_driver = nova_contrail_vif.contrailvif.VRouterVIFDriver
 firewall_driver = nova.virt.firewall.NoopFirewallDriver
 glance_port = 9292
 glance_num_retries = 10
diff --git a/nova/files/kilo/nova-compute.conf.Redhat b/nova/files/kilo/nova-compute.conf.Redhat
new file mode 120000
index 0000000..ad4c8f6
--- /dev/null
+++ b/nova/files/kilo/nova-compute.conf.Redhat
@@ -0,0 +1 @@
+nova-compute.conf.Debian
\ No newline at end of file
diff --git a/nova/files/kilo/nova-controller.conf.RedHat b/nova/files/kilo/nova-controller.conf.RedHat
new file mode 120000
index 0000000..09c7524
--- /dev/null
+++ b/nova/files/kilo/nova-controller.conf.RedHat
@@ -0,0 +1 @@
+nova-controller.conf.Debian
\ No newline at end of file
diff --git a/nova/files/kilo/qemu.conf.RedHat b/nova/files/kilo/qemu.conf.RedHat
new file mode 120000
index 0000000..1d23f19
--- /dev/null
+++ b/nova/files/kilo/qemu.conf.RedHat
@@ -0,0 +1 @@
+qemu.conf.Debian
\ No newline at end of file
diff --git a/nova/files/liberty/api-paste.ini.RedHat b/nova/files/liberty/api-paste.ini.RedHat
new file mode 120000
index 0000000..08fd76a
--- /dev/null
+++ b/nova/files/liberty/api-paste.ini.RedHat
@@ -0,0 +1 @@
+api-paste.ini.Debian
\ No newline at end of file
diff --git a/nova/files/liberty/libvirt-bin b/nova/files/liberty/libvirt.Debian
similarity index 100%
rename from nova/files/liberty/libvirt-bin
rename to nova/files/liberty/libvirt.Debian
diff --git a/nova/files/liberty/libvirt.RedHat b/nova/files/liberty/libvirt.RedHat
new file mode 100644
index 0000000..f63cdab
--- /dev/null
+++ b/nova/files/liberty/libvirt.RedHat
@@ -0,0 +1,11 @@
+# Defaults for libvirt-bin initscript (/etc/init.d/libvirt-bin)
+# This is a POSIX shell fragment
+
+# Start libvirtd to handle qemu/kvm:
+start_libvirtd="yes"
+
+# options passed to libvirtd, add "-l" to listen on tcp
+libvirtd_opts="-d -l"
+
+# pass in location of kerberos keytab
+#export KRB5_KTNAME=/etc/libvirt/libvirt.keytab
diff --git a/nova/files/liberty/libvirtd.conf.RedHat b/nova/files/liberty/libvirtd.conf.RedHat
new file mode 120000
index 0000000..2a7b101
--- /dev/null
+++ b/nova/files/liberty/libvirtd.conf.RedHat
@@ -0,0 +1 @@
+libvirtd.conf.Debian
\ No newline at end of file
diff --git a/nova/files/liberty/nova-compute.conf.contrail.Debian b/nova/files/liberty/nova-compute.conf.Debian
similarity index 98%
rename from nova/files/liberty/nova-compute.conf.contrail.Debian
rename to nova/files/liberty/nova-compute.conf.Debian
index 360fc66..bcd3251 100644
--- a/nova/files/liberty/nova-compute.conf.contrail.Debian
+++ b/nova/files/liberty/nova-compute.conf.Debian
@@ -65,7 +65,6 @@
 heal_instance_info_cache_interval = 0
 libvirt_cpu_mode = host-passthrough
 image_cache_manager_interval = 0
-libvirt_vif_driver = nova_contrail_vif.contrailvif.VRouterVIFDriver
 firewall_driver = nova.virt.firewall.NoopFirewallDriver
 glance_port = 9292
 glance_num_retries = 10
diff --git a/nova/files/liberty/nova-compute.conf.Redhat b/nova/files/liberty/nova-compute.conf.Redhat
new file mode 120000
index 0000000..ad4c8f6
--- /dev/null
+++ b/nova/files/liberty/nova-compute.conf.Redhat
@@ -0,0 +1 @@
+nova-compute.conf.Debian
\ No newline at end of file
diff --git a/nova/files/liberty/nova-controller.conf.RedHat b/nova/files/liberty/nova-controller.conf.RedHat
new file mode 120000
index 0000000..09c7524
--- /dev/null
+++ b/nova/files/liberty/nova-controller.conf.RedHat
@@ -0,0 +1 @@
+nova-controller.conf.Debian
\ No newline at end of file
diff --git a/nova/files/liberty/qemu.conf.RedHat b/nova/files/liberty/qemu.conf.RedHat
new file mode 120000
index 0000000..1d23f19
--- /dev/null
+++ b/nova/files/liberty/qemu.conf.RedHat
@@ -0,0 +1 @@
+qemu.conf.Debian
\ No newline at end of file
diff --git a/nova/map.jinja b/nova/map.jinja
index bbd8f6a..3d786a1 100644
--- a/nova/map.jinja
+++ b/nova/map.jinja
@@ -22,6 +22,9 @@
     'Debian': {
         'pkgs': ['nova-compute-kvm', 'python-novaclient', 'pm-utils', 'sysfsutils', 'sg3-utils', 'libvirt-bin', 'python-memcache', 'qemu-kvm','python-guestfs'],
         'services': ['nova-compute', 'libvirt-bin'],
+        'libvirt_config': 'libvirtd.conf',
+        'libvirt_bin': '/etc/default/libvirt-bin',
+        'libvirt_service': 'libvirt-bin',
         'bind': compute_bind_defaults,
         'debug': false,
         'heal_instance_info_cache_interval': '60',
@@ -29,6 +32,9 @@
     'RedHat': {
         'pkgs': ['openstack-nova-compute', 'python-novaclient', 'python-nova', 'sysfsutils', 'sg3_utils'],
         'services': ['messagebus', 'openstack-nova-compute', 'libvirtd'],
+        'libvirt_config': 'libvirt.conf',
+        'libvirt_bin': '/etc/sysconfig/libvirtd',
+        'libvirt_service': 'libvirtd',
         'bind': compute_bind_defaults,
         'debug': false,
         'heal_instance_info_cache_interval': '60',