commit c369d84a523c3b3e5f23a7350a38f0d1117a71b7
author Dmitry Stremkovskiy <dstremkouski@mirantis.com> Tue Jul 11 20:59:52 2017 +0300
committer Dzmitry Stremkouski <dstremkouski@mirantis.com> Tue Jul 11 18:05:28 2017 +0000
tree 763a7757e4e063a04bcccb87736998891cffc0fe
parent f24bcb56fc26ac3e1d04895ff121f7419fef1826

Fixing issue with dual-role hash like:

  cinder:
    controller:
      enabled: false
    volume:
      enabled: true
      cinder_uid: 118
      cinder_gid: 124

Change-Id: Ifd3a64a1c14134c3aea16035874cc153b1121bef

cinder/volume.sls

diff --git a/cinder/volume.sls b/cinder/volume.sls
index 31b2af9..29f7ef6 100644
--- a/cinder/volume.sls
+++ b/cinder/volume.sls
@@ -1,8 +1,8 @@
 {%- from "cinder/map.jinja" import volume with context %}
 {%- if volume.enabled %}
 
-{%- if pillar.cinder.controller is not defined %}
-{%- set user = volume %} 
+{%- if not pillar.cinder.get('controller', {}).get('enabled', False) %}
+{%- set user = volume %}
 {%- include "cinder/user.sls" %}
 {%- endif %}