diff --git a/tests/pillar/ceph_single.sls b/tests/pillar/ceph_single.sls
index de5f2cc..79838a2 100644
--- a/tests/pillar/ceph_single.sls
+++ b/tests/pillar/ceph_single.sls
@@ -11,6 +11,35 @@
         user: cinder
         secret_uuid: password
         client_cinder_key: password
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: cinder
+      password: pwd
+      region: regionOne
+    osapi:
+      host: 127.0.0.1
+    osapi_max_limit: 500
+    glance:
+        host: 127.0.0.1
+        port: 9292
+    default_volume_type: 7k2SaS
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: pwd
+      virtual_host: '/openstack'
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: cinder
+      user: cinder
+      password: pwd
   volume:
     enabled: true
     version: liberty
@@ -22,4 +51,32 @@
         engine: ceph
         user: cinder
         secret_uuid: password
-        client_cinder_key: password
\ No newline at end of file
+        client_cinder_key: password
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: cinder
+      password: pwd
+      region: regionOne
+    osapi:
+        host: 127.0.0.1
+    glance:
+        host: 127.0.0.1
+        port: 9292
+    default_volume_type: 7k2SaS
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: pwd
+      virtual_host: '/openstack'
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: cinder
+      user: cinder
+      password: pwd
diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index 9fcafb4..62bb44b 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -41,6 +41,12 @@
         port: 11211
       - host: 127.0.0.1
         port: 11211
+    storage:
+      engine: storwize
+      host: 192.168.0.1
+      port: 22
+      user: username
+      password: pass
 
     audit:
       filter_factory: 'keystonemiddleware.audit:filter_factory'
diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls
index 73a7a2e..ef2136a 100644
--- a/tests/pillar/control_single.sls
+++ b/tests/pillar/control_single.sls
@@ -30,3 +30,9 @@
       user: openstack
       password: password
       virtual_host: '/openstack'
+    storage:
+        engine: storwize
+        host: 192.168.0.1
+        port: 22
+        user: username
+        password: pass
diff --git a/tests/pillar/eternus_single.sls b/tests/pillar/eternus_single.sls
index 52b722c..2e5f083 100644
--- a/tests/pillar/eternus_single.sls
+++ b/tests/pillar/eternus_single.sls
@@ -23,6 +23,34 @@
         password: password
         connection: FC
         name: 7k2RAID6
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: cinder
+      password: pwd
+      region: regionOne
+    osapi:
+      host: 127.0.0.1
+    glance:
+      host: 127.0.0.1
+      port: 9292
+    default_volume_type: 7k2SaS
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: pwd
+      virtual_host: '/openstack'
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: cinder
+      user: cinder
+      password: pwd  
   controller:
     enabled: true
     version: liberty
@@ -46,4 +74,33 @@
         user: username
         password: password
         connection: FC
-        name: 7k2RAID6
\ No newline at end of file
+        name: 7k2RAID6
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: cinder
+      password: pwd
+      region: regionOne
+    osapi:
+      host: 127.0.0.1
+    osapi_max_limit: 500
+    glance:
+      host: 127.0.0.1
+      port: 9292
+    default_volume_type: 7k2SaS
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: pwd
+      virtual_host: '/openstack'
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: cinder
+      user: cinder
+      password: pwd
diff --git a/tests/pillar/gpfs_single.sls b/tests/pillar/gpfs_single.sls
index 4bb04d7..f77608d 100644
--- a/tests/pillar/gpfs_single.sls
+++ b/tests/pillar/gpfs_single.sls
@@ -11,6 +11,34 @@
         type_name: GPFS-SILVER
         engine: gpfs
         mount_point: '/mnt/gpfs-openstack/cinder/silver'
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: cinder
+      password: pwd
+      region: regionOne
+    osapi:
+        host: 127.0.0.1
+    glance:
+        host: 127.0.0.1
+        port: 9292
+    default_volume_type: 7k2SaS
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: pwd
+      virtual_host: '/openstack'
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: cinder
+      user: cinder
+      password: pwd
   controller:
     enabled: true
     version: liberty
@@ -22,4 +50,33 @@
       GPFS-SILVER:
         type_name: GPFS-SILVER
         engine: gpfs
-        mount_point: '/mnt/gpfs-openstack/cinder/silver'
\ No newline at end of file
+        mount_point: '/mnt/gpfs-openstack/cinder/silver'
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: cinder
+      password: pwd
+      region: regionOne
+    osapi:
+      host: 127.0.0.1
+    osapi_max_limit: 500
+    glance:
+        host: 127.0.0.1
+        port: 9292
+    default_volume_type: 7k2SaS
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: pwd
+      virtual_host: '/openstack'
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: cinder
+      user: cinder
+      password: pwd
diff --git a/tests/pillar/hp3par_single.sls b/tests/pillar/hp3par_single.sls
index cb93ba1..774c934 100644
--- a/tests/pillar/hp3par_single.sls
+++ b/tests/pillar/hp3par_single.sls
@@ -5,6 +5,7 @@
     backend:
       hp3par_backend:
         type_name: hp3par
+        engine: hp3par
         backend: hp3par_backend
         user: admin
         password: password  
@@ -15,6 +16,35 @@
         sanpassword: password
         debug: True
         snapcpg: OpenStackSNAPCPG
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: cinder
+      password: pwd
+      region: regionOne
+    osapi:
+      host: 127.0.0.1
+    osapi_max_limit: 500
+    glance:
+        host: 127.0.0.1
+        port: 9292
+    default_volume_type: 7k2SaS
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: pwd
+      virtual_host: '/openstack'
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: cinder
+      user: cinder
+      password: pwd
   volume:
     enabled: true
     version: liberty
@@ -31,4 +61,32 @@
         sanpassword: password
         debug: True
         snapcpg: OpenStackSNAPCPG
-        engine: hp3par
\ No newline at end of file
+        engine: hp3par
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: cinder
+      password: pwd
+      region: regionOne
+    osapi:
+        host: 127.0.0.1
+    glance:
+        host: 127.0.0.1
+        port: 9292
+    default_volume_type: 7k2SaS
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: pwd
+      virtual_host: '/openstack'
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: cinder
+      user: cinder
+      password: pwd
diff --git a/tests/pillar/lefthand_single.sls b/tests/pillar/lefthand_single.sls
index 9a48eec..ffec435 100644
--- a/tests/pillar/lefthand_single.sls
+++ b/tests/pillar/lefthand_single.sls
@@ -11,6 +11,34 @@
         password: password
         clustername: cluster1
         iscsi_chap_enabled: false
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: cinder
+      password: pwd
+      region: regionOne
+    osapi:
+        host: 127.0.0.1
+    glance:
+        host: 127.0.0.1
+        port: 9292
+    default_volume_type: 7k2SaS
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: pwd
+      virtual_host: '/openstack'
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: cinder
+      user: cinder
+      password: pwd
   controller:
     enabled: true
     version: liberty
@@ -22,4 +50,33 @@
         username: username
         password: password
         clustername: cluster1
-        iscsi_chap_enabled: false
\ No newline at end of file
+        iscsi_chap_enabled: false
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: cinder
+      password: pwd
+      region: regionOne
+    osapi:
+      host: 127.0.0.1
+    osapi_max_limit: 500
+    glance:
+        host: 127.0.0.1
+        port: 9292
+    default_volume_type: 7k2SaS
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: pwd
+      virtual_host: '/openstack'
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: cinder
+      user: cinder
+      password: pwd
diff --git a/tests/pillar/solidfire_single.sls b/tests/pillar/solidfire_single.sls
index a75d6f4..4ce427d 100644
--- a/tests/pillar/solidfire_single.sls
+++ b/tests/pillar/solidfire_single.sls
@@ -11,6 +11,34 @@
         san_password: password
         clustername: cluster1
         sf_emulate_512: false
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: cinder
+      password: pwd
+      region: regionOne
+    osapi:
+        host: 127.0.0.1
+    glance:
+        host: 127.0.0.1
+        port: 9292
+    default_volume_type: 7k2SaS
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: pwd
+      virtual_host: '/openstack'
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: cinder
+      user: cinder
+      password: pwd
   controller:
     enabled: true
     version: liberty
@@ -22,4 +50,33 @@
         san_login: username
         san_password: password
         clustername: cluster1
-        sf_emulate_512: false
\ No newline at end of file
+        sf_emulate_512: false
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: cinder
+      password: pwd
+      region: regionOne
+    osapi:
+      host: 127.0.0.1
+    osapi_max_limit: 500
+    glance:
+        host: 127.0.0.1
+        port: 9292
+    default_volume_type: 7k2SaS
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: pwd
+      virtual_host: '/openstack'
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: cinder
+      user: cinder
+      password: pwd
diff --git a/tests/pillar/storwize_single.sls b/tests/pillar/storwize_single.sls
index 96c6b6f..01cd8b9 100644
--- a/tests/pillar/storwize_single.sls
+++ b/tests/pillar/storwize_single.sls
@@ -36,6 +36,34 @@
         multihost: true
         multipath: true
         pool: SAS15K
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: cinder
+      password: pwd
+      region: regionOne
+    osapi:
+        host: 127.0.0.1
+    glance:
+        host: 127.0.0.1
+        port: 9292
+    default_volume_type: 7k2SaS
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: pwd
+      virtual_host: '/openstack'
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: cinder
+      user: cinder
+      password: pwd
   controller:
     enabled: true
     version: liberty
@@ -72,4 +100,33 @@
         connection: FC
         multihost: true
         multipath: true
-        pool: SAS15K
\ No newline at end of file
+        pool: SAS15K
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: cinder
+      password: pwd
+      region: regionOne
+    osapi:
+      host: 127.0.0.1
+    osapi_max_limit: 500
+    glance:
+        host: 127.0.0.1
+        port: 9292
+    default_volume_type: 7k2SaS
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: pwd
+      virtual_host: '/openstack'
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: cinder
+      user: cinder
+      password: pwd
diff --git a/tests/pillar/volume_single.sls b/tests/pillar/volume_single.sls
index d8f7071..e86b45f 100644
--- a/tests/pillar/volume_single.sls
+++ b/tests/pillar/volume_single.sls
@@ -19,6 +19,7 @@
       user: cinder
       password: password
       endpoint_type: internalURL
+      region: regionOne
     glance:
       host: 127.0.0.1
       port: 9292
@@ -29,3 +30,9 @@
       user: openstack
       password: password
       virtual_host: '/openstack'
+    storage:
+      engine: storwize
+      host: 192.168.0.1
+      port: 22
+      user: username
+      password: pass
diff --git a/tests/pillar/vsp_single.sls b/tests/pillar/vsp_single.sls
index 13450b4..3258ab7 100644
--- a/tests/pillar/vsp_single.sls
+++ b/tests/pillar/vsp_single.sls
@@ -8,6 +8,42 @@
         backend: hus100_backend
         engine: hitachi_vsp
         connection: FC
+        storage_id: 1
+        pool_id: 10
+        thin_pool_id: 12
+        user: admin
+        password: password
+        target_ports: CL3-B
+        compute_target_ports: CL1-E,CL2-E,CL3-B,CL4-D
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: cinder
+      password: pwd
+      region: regionOne
+    osapi:
+      host: 127.0.0.1
+    osapi_max_limit: 500
+    glance:
+        host: 127.0.0.1
+        port: 9292
+    default_volume_type: 7k2SaS
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: pwd
+      virtual_host: '/openstack'
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: cinder
+      user: cinder
+      password: pwd
   volume:
     enabled: true
     version: liberty
@@ -16,4 +52,32 @@
         type_name: HUS100
         backend: hus100_backend
         engine: hitachi_vsp
-        connection: FC
\ No newline at end of file
+        connection: FC
+    identity:
+      engine: keystone
+      host: 127.0.0.1
+      port: 35357
+      tenant: service
+      user: cinder
+      password: pwd
+      region: regionOne
+    osapi:
+        host: 127.0.0.1
+    glance:
+        host: 127.0.0.1
+        port: 9292
+    default_volume_type: 7k2SaS
+    message_queue:
+      engine: rabbitmq
+      host: 127.0.0.1
+      port: 5672
+      user: openstack
+      password: pwd
+      virtual_host: '/openstack'
+    database:
+      engine: mysql
+      host: 127.0.0.1
+      port: 3306
+      name: cinder
+      user: cinder
+      password: pwd