commit 822bb4d9d5d2491efaeddb290cc757cff9c8d44e
author Simon Pasquier <spasquier@mirantis.com> Mon Nov 28 13:26:12 2016 +0100
committer Simon Pasquier <spasquier@mirantis.com> Mon Dec 12 13:58:56 2016 +0000
tree c2b908af49cb8c93ab2bfae322caa7ad36f58655
parent ea24d9cf3735cbc6311136a32a6aa2cb5de3e46c

Fix Cinder commands

This change forces the use of Bash when running the cinder client. This
is required because the command starts with 'source keystonerc' which is
Bash-specific.

Change-Id: I6e720a6b666772357842729dc95ebc5ef6301c39

cinder/controller.sls

diff --git a/cinder/controller.sls b/cinder/controller.sls
index 25d60bb..a10d5d9 100644
--- a/cinder/controller.sls
+++ b/cinder/controller.sls
@@ -57,6 +57,7 @@
   cmd.run:
   - name: "source /root/keystonerc; cinder type-create {{ backend.type_name }}"
   - unless: "source /root/keystonerc; cinder type-list | grep {{ backend.type_name }}"
+  - shell: /bin/bash
   - require:
     - service: cinder_controller_services
 
@@ -64,6 +65,7 @@
   cmd.run:
   - name: "source /root/keystonerc; cinder type-key {{ backend.type_name }} set volume_backend_name={{ backend_name }}"
   - unless: "source /root/keystonerc; cinder extra-specs-list | grep \"{u'volume_backend_name': u'{{ backend_name }}'}\""
+  - shell: /bin/bash
   - require:
     - cmd: cinder_type_create_{{ backend_name }}
 
@@ -79,6 +81,7 @@
   cmd.run:
   - name: "source /root/keystonerc; cinder type-create {{ type.name }}"
   - unless: "source /root/keystonerc; cinder type-list | grep {{ type.name }}"
+  - shell: /bin/bash
   - require:
     - service: cinder_controller_services
 
@@ -86,6 +89,7 @@
   cmd.run:
   - name: "source /root/keystonerc; cinder type-key {{ type.name }} set volume_backend_name={{ type.get('backend', type.name) }}"
   - unless: "source /root/keystonerc; cinder extra-specs-list | grep \"{u'volume_backend_name': u'{{ type.get('backend', type.name) }}'}\""
+  - shell: /bin/bash
   - require:
     - cmd: cinder_type_create_{{ type.name }}