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 }}