Merge "Do not create cinder-volumes if not needed"

packstack/puppet/templates/cinder_lvm.pp

@@ -1,3 +1,6 @@
+$create_cinder_volume = hiera('CONFIG_CINDER_VOLUMES_CREATE')
+
+if $create_cinder_volume == 'y' {
     class { 'cinder::setup_test_volume':
       size            => hiera('CONFIG_CINDER_VOLUMES_SIZE'),
       loopback_device => '/dev/loop2',
@@ -54,6 +57,13 @@ RequiredBy=openstack-cinder-volume.service',
       }
 
     }
+}
+else {
+    package {'lvm2':
+      ensure => 'present',
+    }
+}
+
 
 file_line { 'snapshot_autoextend_threshold':
   path    => '/etc/lvm/lvm.conf',
@@ -74,6 +84,8 @@ cinder::backend::iscsi { 'lvm':
   require          => Package['lvm2'],
 }
 
+
+
 cinder::type { 'iscsi':
   set_key   => 'volume_backend_name',
   set_value => 'lvm',