diff --git a/cinder/upgrade/render_config.sls b/cinder/upgrade/render_config.sls
index 7191084..bf603f5 100644
--- a/cinder/upgrade/render_config.sls
+++ b/cinder/upgrade/render_config.sls
@@ -1,11 +1,11 @@
 {%- from "cinder/map.jinja" import controller,volume with context %}
 
-{%- if volume.enabled %}
-  {%- set _data = volume %}
-  {%- set type = 'volume' %}
-{%- elif controller.enabled %}
+{%- if controller.enabled %}
   {%- set _data = controller %}
   {%- set type = 'controller' %}
+{%- elif volume.enabled %}
+  {%- set _data = volume %}
+  {%- set type = 'volume' %}
 {%- endif %}
 
 /etc/cinder/cinder.conf: