Merge "set trove_volume_support from the attribute in taskmanager.conf"

spec/taskmanager-suse_spec.rb

@@ -43,7 +43,8 @@ describe 'openstack-database::taskmanager' do
        %r{^cinder_url = http://127.0.0.1:8776/v1/$},
        %r{^swift_url = http://127.0.0.1:8080/v1/$},
        %r{^dns_auth_url = http://127.0.0.1:5000/v2.0$},
-       %r{^log_dir = /var/log/trove}
+       %r{^log_dir = /var/log/trove},
+       /^trove_volume_support = true$/
       ].each do |content|
         expect(chef_run).to render_file(filename).with_content(content)
       end

templates/default/trove-taskmanager.conf.erb

@@ -44,7 +44,7 @@ cinder_url = <%= @block_storage_uri %>
 swift_url = <%= @object_storage_uri %>
 
 # Config options for enabling volume service
-trove_volume_support = True
+trove_volume_support = <%= node['openstack']['database']['volume_support'] %>
 block_device_mapping = vdb
 device_path = /dev/vdb
 mount_point = /var/lib/mysql