Support for Ubuntu 16.04 and Newton
- increments Ubuntu release to 16.04 - increments release to newton for Ubuntu and CentOS - increments apt cookbook version to 4.0 - increments mysql cookbook version to 7.2 Change-Id: I07ad79a93642d0f0c934a864fcb9bcd7b764e35f Implements: blueprint newton-xenial
This commit is contained in:
parent
5d1c372723
commit
9a2c4ee365
|
@ -114,7 +114,7 @@ default['openstack']['secret']['user_passwords_data_bag'] = 'user_passwords'
|
|||
# needs.
|
||||
|
||||
# The coordinated release of OpenStack codename
|
||||
default['openstack']['release'] = 'mitaka'
|
||||
default['openstack']['release'] = 'newton'
|
||||
|
||||
# The Ubuntu Cloud Archive has packages for multiple Ubuntu releases. For
|
||||
# more information, see: https://wiki.ubuntu.com/ServerTeam/CloudArchive.
|
||||
|
@ -127,15 +127,13 @@ default['openstack']['release'] = 'mitaka'
|
|||
default['openstack']['apt']['update_apt_cache'] = false
|
||||
default['openstack']['apt']['live_updates_enabled'] = true
|
||||
default['openstack']['apt']['uri'] = 'http://ubuntu-cloud.archive.canonical.com/ubuntu'
|
||||
default['openstack']['apt']['components'] = ['main']
|
||||
# For the SRU packaging, use this:
|
||||
# default['openstack']['apt']['components'] = [ '%codename%-proposed/%release%', 'main' ]
|
||||
default['openstack']['apt']['components'] = ["xenial-proposed/#{node['openstack']['release']}", 'main']
|
||||
|
||||
default['openstack']['yum']['rdo_enabled'] = true
|
||||
default['openstack']['yum']['uri'] = "http://mirror.centos.org/centos/$releasever/cloud/$basearch/openstack-#{node['openstack']['release']}"
|
||||
default['openstack']['yum']['uri'] = 'https://trunk.rdoproject.org/centos7-master/53/ac/53ac6152735cb1353a3fe0eb91c97a02f541f167_fc22fbaf/'
|
||||
default['openstack']['yum']['repo-key'] = "https://github.com/redhat-openstack/rdo-release/raw/#{node['openstack']['release']}/RPM-GPG-KEY-CentOS-SIG-Cloud"
|
||||
# Enforcing GnuPG signature check for RDO repo. Set this to false if you want to disable the check.
|
||||
default['openstack']['yum']['gpgcheck'] = true
|
||||
default['openstack']['yum']['gpgcheck'] = false
|
||||
default['openstack']['endpoints']['family'] = 'inet'
|
||||
|
||||
# Set a default region that other regions are set to - such that changing the region for all services can be done in one place
|
||||
|
|
|
@ -16,10 +16,10 @@ recipe 'openstack-common::sysctl', 'Configures sysctl settings'
|
|||
supports os
|
||||
end
|
||||
|
||||
depends 'apt', '~> 2.8'
|
||||
depends 'apt', '~> 4.0'
|
||||
depends 'database', '~> 4.0.2'
|
||||
depends 'mariadb', '~> 0.3.1'
|
||||
depends 'mysql', '~> 6.0.13'
|
||||
depends 'mysql', '~> 7.2.0'
|
||||
depends 'yum', '~> 3.5.4'
|
||||
depends 'yum-epel', '~> 0.6.0'
|
||||
depends 'galera', '~> 0.4.1'
|
||||
|
|
|
@ -57,6 +57,14 @@ when 'rhel'
|
|||
enabled true
|
||||
action repo_action
|
||||
end
|
||||
|
||||
yum_repository 'RDO-newton-deps' do
|
||||
description 'Newton delorean-deps'
|
||||
baseurl 'http://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-newton'
|
||||
gpgcheck false
|
||||
enabled true
|
||||
action repo_action
|
||||
end
|
||||
end
|
||||
|
||||
if node['openstack']['databag_type'] == 'vault'
|
||||
|
|
|
@ -5,7 +5,7 @@ require_relative 'spec_helper'
|
|||
describe 'test-openstack-common-database::default' do
|
||||
let(:runner) do
|
||||
ChefSpec::SoloRunner.new(platform: 'ubuntu',
|
||||
version: '14.04',
|
||||
version: '16.04',
|
||||
log_level: :fatal,
|
||||
step_into: ['openstack_common_database'])
|
||||
end
|
||||
|
|
|
@ -14,6 +14,7 @@ describe 'openstack-common::default' do
|
|||
context 'enabling RDO with gpgcheck enabled' do
|
||||
before do
|
||||
node.set['openstack']['yum']['rdo_enabled'] = true
|
||||
node.set['openstack']['yum']['gpgcheck'] = true
|
||||
end
|
||||
|
||||
it 'adds RDO yum repository' do
|
||||
|
|
|
@ -29,16 +29,16 @@ describe 'openstack-common::default' do
|
|||
node.set['openstack']['apt']['live_updates_enabled'] = true
|
||||
expect(chef_run).to add_apt_repository('openstack-ppa').with(
|
||||
uri: 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
|
||||
distribution: 'trusty-updates/mitaka',
|
||||
components: ['main'])
|
||||
distribution: 'xenial-updates/newton',
|
||||
components: ['xenial-proposed/newton', 'main'])
|
||||
end
|
||||
|
||||
it 'disables openstack live updates' do
|
||||
node.set['openstack']['apt']['live_updates_enabled'] = false
|
||||
expect(chef_run).to_not add_apt_repository('openstack-ppa').with(
|
||||
uri: 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
|
||||
distribution: 'trusty-updates/mitaka',
|
||||
components: ['main'])
|
||||
distribution: 'xenial-updates/newton',
|
||||
components: ['xenial-proposed/newton', 'main'])
|
||||
end
|
||||
|
||||
it 'does not install the gem chef-vault by default' do
|
||||
|
|
|
@ -7,7 +7,7 @@ ChefSpec::Coverage.start! { add_filter 'openstack-common' }
|
|||
LOG_LEVEL = :fatal
|
||||
UBUNTU_OPTS = {
|
||||
platform: 'ubuntu',
|
||||
version: '14.04',
|
||||
version: '16.04',
|
||||
log_level: LOG_LEVEL
|
||||
}.freeze
|
||||
REDHAT_OPTS = {
|
||||
|
|
Loading…
Reference in New Issue