starting rocky development patch

Change-Id: Ifcb2cb9d3c3653cb7e41845af42e25ff7fa70772
This commit is contained in:
Samuel Cassiba 2018-08-03 06:30:22 -07:00
parent 0fb71ae5d8
commit 5d36a509ba
5 changed files with 27 additions and 6 deletions

View File

@ -1,3 +1,5 @@
inherit_from: .rubocop_todo.yml
AllCops:
Include:
- metadata.rb

19
.rubocop_todo.yml Normal file
View File

@ -0,0 +1,19 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2018-08-03 05:26:10 -0700 using RuboCop version 0.55.0.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.
# Offense count: 1
# Cop supports --auto-correct.
Style/IfUnlessModifier:
Exclude:
- 'recipes/common.rb'
# Offense count: 51
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
# URISchemes: http, https
Metrics/LineLength:
Max: 163

View File

@ -9,6 +9,6 @@ source 'https://supermarket.chef.io'
end
cookbook 'openstackclient',
github: 'cloudbau/cookbook-openstackclient'
git: 'https://git.openstack.org/openstack/cookbook-openstackclient'
metadata

View File

@ -4,14 +4,14 @@ maintainer_email 'openstack-dev@lists.openstack.org'
license 'Apache-2.0'
description 'Installs and configures the Heat Service'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '17.0.0'
version '18.0.0'
%w(ubuntu redhat centos).each do |os|
supports os
end
depends 'openstack-common', '>= 17.0.0'
depends 'openstack-identity', '>= 17.0.0'
depends 'openstack-common', '>= 18.0.0'
depends 'openstack-identity', '>= 18.0.0'
depends 'openstackclient'
issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url)

View File

@ -240,7 +240,7 @@ end
shared_examples 'logging' do
context 'with logging enabled' do
before do
node.set['openstack']['orchestration']['syslog']['use'] = true
node.override['openstack']['orchestration']['syslog']['use'] = true
end
it 'runs logging recipe if node attributes say to' do
@ -250,7 +250,7 @@ shared_examples 'logging' do
context 'with logging disabled' do
before do
node.set['openstack']['orchestration']['syslog']['use'] = false
node.override['openstack']['orchestration']['syslog']['use'] = false
end
it "doesn't run logging recipe" do