From dd73185f714c6654641e85bb0fb177dc2441609b Mon Sep 17 00:00:00 2001 From: Mark Vanderwiel Date: Mon, 2 Feb 2015 16:32:33 -0600 Subject: [PATCH] Trusty juno updates * update spec platform versions Change-Id: Ib177a9a7fa0be853ef46b1ed59a0c0375b4f0103 Implements: blueprint trusty-juno --- README.md | 4 ++-- spec/mysql-server-redhat_spec.rb | 4 ++-- spec/spec_helper.rb | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c60c3ca..25f72ed 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,9 @@ Chef 11 with Ruby 1.9.x required. # Platforms # -* Ubuntu-12.04 +* Ubuntu-14.04 * SLES 11 SP3 -* RHEL/CentOS 6.5 +* RHEL/CentOS 7.0 # Cookbooks # diff --git a/spec/mysql-server-redhat_spec.rb b/spec/mysql-server-redhat_spec.rb index a305b26..04c4794 100644 --- a/spec/mysql-server-redhat_spec.rb +++ b/spec/mysql-server-redhat_spec.rb @@ -17,8 +17,8 @@ describe 'openstack-ops-database::mysql-server' do end let(:file) { chef_run.template('/etc/mysql/conf.d/openstack.cnf') } - it 'sets mysql version to 5.1' do - expect(chef_run.node['mysql']['version']).to eql '5.1' + it 'sets mysql version to 5.5' do + expect(chef_run.node['mysql']['version']).to eql '5.5' end it 'creates template /etc/mysql/conf.d/openstack.cnf' do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 83e42b1..a461c68 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -12,12 +12,12 @@ SUSE_OPTS = { } REDHAT_OPTS = { platform: 'redhat', - version: '6.5', + version: '7.0', log_level: ::LOG_LEVEL } UBUNTU_OPTS = { platform: 'ubuntu', - version: '12.04', + version: '14.04', log_level: ::LOG_LEVEL } @@ -28,7 +28,7 @@ shared_context 'database-stubs' do # for debian stub_command("\"/usr/bin/mysql\" -u root -e 'show databases;'") # for postgresql - stub_command('ls /var/lib/postgresql/9.1/main/recovery.conf') + stub_command('ls /var/lib/postgresql/9.3/main/recovery.conf') allow_any_instance_of(Chef::Recipe).to receive(:address_for) .with('lo')