Changing condition order in render_config state
The patch changes the order to define role of the nodes
to avoid re-rendering configuration file if controller and
volume roles are defined on the same node.
Change-Id: I663e0ab847dbcaa5b41b99be2b494e4d196e3186
Related-PROD: PROD-27427
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: