Merge "Trusty juno updates"
This commit is contained in:
commit
aa7e4fbdcd
|
@ -8,9 +8,9 @@ Chef 11 with Ruby 1.9.x required.
|
||||||
|
|
||||||
# Platforms #
|
# Platforms #
|
||||||
|
|
||||||
* Ubuntu-12.04
|
* Ubuntu-14.04
|
||||||
* SLES 11 SP3
|
* SLES 11 SP3
|
||||||
* RHEL/CentOS 6.5
|
* RHEL/CentOS 7.0
|
||||||
|
|
||||||
# Cookbooks #
|
# Cookbooks #
|
||||||
|
|
||||||
|
|
|
@ -17,8 +17,8 @@ describe 'openstack-ops-database::mysql-server' do
|
||||||
end
|
end
|
||||||
let(:file) { chef_run.template('/etc/mysql/conf.d/openstack.cnf') }
|
let(:file) { chef_run.template('/etc/mysql/conf.d/openstack.cnf') }
|
||||||
|
|
||||||
it 'sets mysql version to 5.1' do
|
it 'sets mysql version to 5.5' do
|
||||||
expect(chef_run.node['mysql']['version']).to eql '5.1'
|
expect(chef_run.node['mysql']['version']).to eql '5.5'
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'creates template /etc/mysql/conf.d/openstack.cnf' do
|
it 'creates template /etc/mysql/conf.d/openstack.cnf' do
|
||||||
|
|
|
@ -12,12 +12,12 @@ SUSE_OPTS = {
|
||||||
}
|
}
|
||||||
REDHAT_OPTS = {
|
REDHAT_OPTS = {
|
||||||
platform: 'redhat',
|
platform: 'redhat',
|
||||||
version: '6.5',
|
version: '7.0',
|
||||||
log_level: ::LOG_LEVEL
|
log_level: ::LOG_LEVEL
|
||||||
}
|
}
|
||||||
UBUNTU_OPTS = {
|
UBUNTU_OPTS = {
|
||||||
platform: 'ubuntu',
|
platform: 'ubuntu',
|
||||||
version: '12.04',
|
version: '14.04',
|
||||||
log_level: ::LOG_LEVEL
|
log_level: ::LOG_LEVEL
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@ shared_context 'database-stubs' do
|
||||||
# for debian
|
# for debian
|
||||||
stub_command("\"/usr/bin/mysql\" -u root -e 'show databases;'")
|
stub_command("\"/usr/bin/mysql\" -u root -e 'show databases;'")
|
||||||
# for postgresql
|
# 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)
|
allow_any_instance_of(Chef::Recipe).to receive(:address_for)
|
||||||
.with('lo')
|
.with('lo')
|
||||||
|
|
Loading…
Reference in New Issue