Update trove to 4aa993d4355ef7637a1a217db15d6ab1fc3af4ed

4aa993d4355ef7637a1a217db15d6ab1fc3af4ed Fix spec tests for RSpec 3.x and Puppet 4.x
25ad7704797491194e10f71db867fb7aea3bc939 Merge "Bump rspec-puppet to 2.1.0"
6058f2c7a9cc48b2ac981c4488d6a8d169dcf081 Bump rspec-puppet to 2.1.0
bc197410acc13d8d85ebeca97c925068739ae622 MySQL: change default MySQL collate to utf8_general_ci
70325fb0fc1dad9254a3520095d20c75342daf64 Pin puppetlabs-concat to 1.2.1 in fixtures

Change-Id: I0fc416e203e12ae05ed1cd86aca23d57f2aea501

Puppetfile

@@ -211,7 +211,7 @@ mod 'tripleo',
   :git => 'https://github.com/stackforge/puppet-tripleo.git'
 
 mod 'trove',
-  :commit => '27f3940b92d803e18bbad37a40533bdeeab0a85e',
+  :commit => '4aa993d4355ef7637a1a217db15d6ab1fc3af4ed',
   :git => 'https://github.com/stackforge/puppet-trove'
 
 mod 'tuskar',

trove/.fixtures.yml

@@ -1,7 +1,9 @@
 fixtures:
   repositories:
     'inifile':  'git://github.com/puppetlabs/puppetlabs-inifile'
-    'concat': 'git://github.com/puppetlabs/puppetlabs-concat.git'
+    'concat':
+      'repo': 'git://github.com/puppetlabs/puppetlabs-concat.git'
+      'ref': '1.2.1'
     'keystone': 'git://github.com/stackforge/puppet-keystone.git'
     'mysql': 'git://github.com/puppetlabs/puppetlabs-mysql.git'
     'openstacklib': 'git://github.com/stackforge/puppet-openstacklib.git'

trove/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
-  gem 'rspec-puppet', '~> 2.0.0', :require => false
+  gem 'rspec-puppet', '~> 2.1.0', :require => false
 
   gem 'metadata-json-lint'
   gem 'puppet-lint-param-docs'

trove/manifests/db/mysql.pp

@@ -47,7 +47,7 @@
 #
 # [*collate*]
 #   (optional) Charset collate of trove database
-#   Defaults 'utf8_unicode_ci'.
+#   Defaults 'utf8_general_ci'.
 #
 # [*mysql_module*]
 #   (optional) Deprecated. Does nothing
@@ -59,7 +59,7 @@
   $host          = '127.0.0.1',
   $allowed_hosts = undef,
   $charset       = 'utf8',
-  $collate       = 'utf8_unicode_ci',
+  $collate       = 'utf8_general_ci',
   $mysql_module  = undef,
 ) {
 

trove/spec/classes/trove_db_mysql_spec.rb

@@ -31,7 +31,7 @@
       :password      => 's3cr3t',
       :user          => 'trove',
       :charset       => 'utf8',
-      :collate       => 'utf8_unicode_ci',
+      :collate       => 'utf8_general_ci',
       :host          => '127.0.0.1',
     }
   end

trove/spec/classes/trove_keystone_auth_spec.rb

@@ -40,7 +40,7 @@
 
     it { is_expected.to contain_keystone_user_role('trove@foobar').with(
       :ensure  => 'present',
-      :roles   => 'admin'
+      :roles   => ['admin']
     )}
 
     it { is_expected.to contain_keystone_service('trove').with(

trove/spec/unit/provider/trove_config/ini_setting_spec.rb

@@ -22,16 +22,16 @@
       {:name => 'DEFAULT/foo', :value => 'bar'}
     )
     provider = provider_class.new(resource)
-    provider.section.should == 'DEFAULT'
-    provider.setting.should == 'foo'
+    expect(provider.section).to eq('DEFAULT')
+    expect(provider.setting).to eq('foo')
   end
 
   it 'should allow setting to be set explicitly' do
     resource = Puppet::Type::Trove_config.new(
       {:name => 'dude/foo', :value => 'bar'}
     )
     provider = provider_class.new(resource)
-    provider.section.should == 'dude'
-    provider.setting.should == 'foo'
+    expect(provider.section).to eq('dude')
+    expect(provider.setting).to eq('foo')
   end
 end

trove/spec/unit/provider/trove_datastore/trove_spec.rb

@@ -30,12 +30,12 @@
 
   describe "self.instances" do
     it "should have an instances method" do
-      provider.class.should respond_to(:instances)
+      expect(provider.class).to respond_to(:instances)
     end
 
     it "should list instances" do
       datastores = described_class.instances
-      datastores.size.should == 1
+      expect(datastores.size).to eq(1)
       datastores.map {|provider| provider.name} == datastore_name
     end
   end

trove/spec/unit/provider/trove_datastore_version/trove_spec.rb

@@ -32,7 +32,7 @@
 
   describe "self.instances" do
     it "should have an instances method" do
-      provider.class.should respond_to(:instances)
+      expect(provider.class).to respond_to(:instances)
     end
   end
 

trove/spec/unit/type/trove_config_spec.rb

@@ -29,19 +29,19 @@
 
   it 'should accept a valid value' do
     @trove_config[:value] = 'bar'
-    @trove_config[:value].should == 'bar'
+    expect(@trove_config[:value]).to eq('bar')
   end
 
   it 'should not accept a value with whitespace' do
     @trove_config[:value] = 'b ar'
-    @trove_config[:value].should == 'b ar'
+    expect(@trove_config[:value]).to eq('b ar')
   end
 
   it 'should accept valid ensure values' do
     @trove_config[:ensure] = :present
-    @trove_config[:ensure].should == :present
+    expect(@trove_config[:ensure]).to eq(:present)
     @trove_config[:ensure] = :absent
-    @trove_config[:ensure].should == :absent
+    expect(@trove_config[:ensure]).to eq(:absent)
   end
 
   it 'should not accept invalid ensure values' do