From 2f2194347bc14dcc6029d2c556ecf33c9b62ffe5 Mon Sep 17 00:00:00 2001 From: Jens Harbott Date: Mon, 11 Mar 2019 15:24:47 +0000 Subject: [PATCH] Add apache2 version cap Turns out that the chef server thinks that '6' is an invalid version, need to use '6.0' instead, otherwise uploading the cookbook to a chef server fails. Cherry-pick from stable/queens, amended with the actual cap, which was brought into stable/queens together with a different patch in order to unblock the CI. Change-Id: I848b3fd923fface842578ae614c2d9b1e14a0892 (cherry picked from commit b4683fe828beb75e8c4d983194692e1073e7f873) --- metadata.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata.rb b/metadata.rb index 158602a..9f449c2 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ maintainer_email 'openstack-dev@lists.openstack.org' license 'Apache-2.0' description 'The OpenStack Identity service Keystone.' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '16.1.0' +version '16.2.0' %w(ubuntu redhat centos).each do |os| supports os @@ -13,7 +13,7 @@ end depends 'openstack-common', '>= 16.0.0' depends 'openstackclient' -depends 'apache2' +depends 'apache2', '< 6.0' issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url) source_url 'https://github.com/openstack/cookbook-openstack-identity' if respond_to?(:source_url)