From c07b0f75faf3aacd6a5e783c1dd3e7d79f4674c2 Mon Sep 17 00:00:00 2001
From: Jan Klare <j.klare@cloudbau.de>
Date: Mon, 5 Dec 2016 12:29:54 +0100
Subject: [PATCH] update cookbook dependencies for next release

Depends-On: Ib256c315d5439beb8d4ec83c5cc7d7c9b182378a
Change-Id: I50df0befac140660d58eccb939d33a83edbb441c
---
 metadata.rb               | 10 +++++-----
 spec/mysql-server_spec.rb | 17 +++++++++++++++++
 spec/spec_helper.rb       |  2 +-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/metadata.rb b/metadata.rb
index 2272704..e0ee087 100755
--- a/metadata.rb
+++ b/metadata.rb
@@ -21,10 +21,10 @@ recipe 'openstack-db', 'Creates necessary tables, users, and grants for OpenStac
   supports os
 end
 
-depends 'mariadb', '~> 0.3.1'
+depends 'mariadb', '~> 0.3.3'
 depends 'percona', '~> 0.16.1'
-depends 'mysql', '~> 8.0'
-depends 'mysql2_chef_gem', '~> 1.1.0'
-depends 'postgresql', '~> 3.4.18'
-depends 'database', '~> 6.0'
+depends 'mysql', '~> 8.2'
+depends 'mysql2_chef_gem', '~> 1.1'
+depends 'postgresql', '~> 5.1'
+depends 'database', '~> 6.1'
 depends 'openstack-common', '>= 14.0.0'
diff --git a/spec/mysql-server_spec.rb b/spec/mysql-server_spec.rb
index 64218cc..f5689d9 100644
--- a/spec/mysql-server_spec.rb
+++ b/spec/mysql-server_spec.rb
@@ -24,6 +24,23 @@ describe 'openstack-ops-database::mysql-server' do
       )
     end
 
+    describe 'creates mysql service with different values' do
+      before do
+        node.set['openstack']['mysql']['data_dir'] = '/other-dir'
+        node.set['openstack']['mysql']['version'] = '5.7'
+      end
+      it do
+        expect(chef_run).to create_mysql_service('default').with(
+          version: '5.7',
+          data_dir: '/other-dir',
+          initial_root_password: 'abc123',
+          bind_address: '127.0.0.1',
+          port: '3306',
+          action: [:create, :start]
+        )
+      end
+    end
+
     describe 'openstack.cnf' do
       let(:file) { '/etc/mysql/conf.d/openstack.cnf' }
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 20b2de6..797ad51 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -24,7 +24,7 @@ shared_context 'database-stubs' do
     stub_command("\"/usr/bin/mysql\" -u root -e 'show databases;'")
     stub_command("mysqladmin --user=root --password='' version")
     # for postgresql
-    stub_command('ls /var/lib/postgresql/9.3/main/recovery.conf')
+    stub_command('ls /var/lib/postgresql/9.5/main/recovery.conf')
     stub_search('node', "recipes:\"percona\\:\\:cluster\"").and_return([])
 
     allow_any_instance_of(Chef::Recipe).to receive(:address_for)