Updates for Train

Changed:
- Update release to train
- Update to apache2 ~> 8.1

Fixed:
- ChefSpec

Removed:
- Unused rubocop rules

Change-Id: I804485a93475cdfd651ccee21c93fce844872b3b
Depends-On: https://review.opendev.org/731859
Depends-On: https://review.opendev.org/731860
This commit is contained in:
Lance Albertson 2020-05-29 17:50:12 -07:00
parent 1b39032b8d
commit 1600e4752d
4 changed files with 11 additions and 25 deletions

View File

@ -1,14 +0,0 @@
AllCops:
Include:
- metadata.rb
- Gemfile
- attributes/**
- libraries/**
- providers/**
- recipes/**
- resources/**
- spec/**
Exclude:
- .cookbooks/**/*
- berks-cookbooks/**/*
- .bundle/**/*

View File

@ -21,7 +21,7 @@ Requirements
============
- Chef 15 or higher
- Chef Workstation 0.15.18 for testing (also includes berkshelf for
- Chef Workstation 0.18.3 for testing (also includes berkshelf for
cookbook dependency resolution)
Platform
@ -36,12 +36,12 @@ Cookbooks
The following cookbooks are dependencies:
- 'apache2', '~> 8.0'
- 'apache2', '~> 8.1'
- 'lvm'
- 'openstackclient'
- 'openstack-common', '>= 19.0.0'
- 'openstack-identity', '>= 19.0.0'
- 'openstack-image', '>= 19.0.0'
- 'openstack-common', '>= 20.0.0'
- 'openstack-identity', '>= 20.0.0'
- 'openstack-image', '>= 20.0.0'
Attributes
==========

View File

@ -3,18 +3,18 @@ maintainer 'Chef OpenStack'
maintainer_email 'openstack-discuss@lists.openstack.org'
license 'Apache-2.0'
description 'The OpenStack Advanced Volume Management service Cinder.'
version '19.0.0'
version '20.0.0'
%w(ubuntu redhat centos).each do |os|
supports os
end
depends 'apache2', '~> 8.0'
depends 'apache2', '~> 8.1'
depends 'lvm'
depends 'openstackclient'
depends 'openstack-common', '>= 19.0.0'
depends 'openstack-identity', '>= 19.0.0'
depends 'openstack-image', '>= 19.0.0'
depends 'openstack-common', '>= 20.0.0'
depends 'openstack-identity', '>= 20.0.0'
depends 'openstack-image', '>= 20.0.0'
issues_url 'https://launchpad.net/openstack-chef'
source_url 'https://opendev.org/openstack/cookbook-openstack-block-storage'

View File

@ -72,7 +72,7 @@ describe 'openstack-block-storage::api' do
end
it do
expect(chef_run).to install_apache2_install('openstack').with(listen: '127.0.0.1:8776')
expect(chef_run).to install_apache2_install('openstack').with(listen: %w(127.0.0.1:8776))
end
it do