Trusty juno updates

* update spec platform versions

Change-Id: Ib177a9a7fa0be853ef46b1ed59a0c0375b4f0103
Implements: blueprint trusty-juno
This commit is contained in:
Mark Vanderwiel 2015-02-02 16:32:33 -06:00
parent 29ac48e993
commit dd73185f71
3 changed files with 7 additions and 7 deletions

View File

@ -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 #

View File

@ -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

View File

@ -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')