Merge "Trusty juno updates"

This commit is contained in:
Jenkins 2015-02-10 19:07:31 +00:00 committed by Gerrit Code Review
commit 09076c872e
2 changed files with 3 additions and 3 deletions

View File

@ -8,7 +8,7 @@ Chef 11 with Ruby 1.9.x required.
# Platforms # # Platforms #
* Ubuntu-12.04 * Ubuntu-14.04
# Cookbooks # # Cookbooks #

View File

@ -7,12 +7,12 @@ ChefSpec::Coverage.start! { add_filter 'openstack-ops-messaging' }
LOG_LEVEL = :fatal LOG_LEVEL = :fatal
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
} }
SUSE_OPTS = { SUSE_OPTS = {