Updates for Train
Changed: - Update release to train - Fix ChefDeprecations/LogResourceNotifications in run_tempest recipe and use notify_group instead. - Require Chef >= 15.8 since we're using notify_group now Removed: - Unused rubocop rules Change-Id: I74963bd15968500f11bb70fed85eaa39381495d3 Depends-On: https://review.opendev.org/731859 Depends-On: https://review.opendev.org/731877 Depends-On: https://review.opendev.org/731860 Depends-On: https://review.opendev.org/731865
This commit is contained in:
parent
87b4f83273
commit
cb7643daef
16
.rubocop.yml
16
.rubocop.yml
|
@ -1,16 +0,0 @@
|
||||||
inherit_from: .rubocop_todo.yml
|
|
||||||
|
|
||||||
AllCops:
|
|
||||||
Include:
|
|
||||||
- metadata.rb
|
|
||||||
- Gemfile
|
|
||||||
- attributes/**
|
|
||||||
- libraries/**
|
|
||||||
- providers/**
|
|
||||||
- recipes/**
|
|
||||||
- resources/**
|
|
||||||
- spec/**
|
|
||||||
Exclude:
|
|
||||||
- .cookbooks/**/*
|
|
||||||
- berks-cookbooks/**/*
|
|
||||||
- .bundle/**/*
|
|
|
@ -1,25 +0,0 @@
|
||||||
# This configuration was generated by
|
|
||||||
# `rubocop --auto-gen-config`
|
|
||||||
# on 2018-08-03 05:26:02 -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.
|
|
||||||
Lint/RedundantWithIndex:
|
|
||||||
Exclude:
|
|
||||||
- 'recipes/setup.rb'
|
|
||||||
|
|
||||||
# Offense count: 1
|
|
||||||
# Cop supports --auto-correct.
|
|
||||||
Style/IfUnlessModifier:
|
|
||||||
Exclude:
|
|
||||||
- 'recipes/create_network.rb'
|
|
||||||
|
|
||||||
# Offense count: 33
|
|
||||||
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
|
|
||||||
# URISchemes: http, https
|
|
||||||
Metrics/LineLength:
|
|
||||||
Max: 127
|
|
|
@ -21,7 +21,7 @@ Requirements
|
||||||
============
|
============
|
||||||
|
|
||||||
- Chef 15 or higher
|
- 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)
|
cookbook dependency resolution)
|
||||||
|
|
||||||
Cookbooks
|
Cookbooks
|
||||||
|
@ -31,8 +31,9 @@ The following cookbooks are dependencies:
|
||||||
|
|
||||||
- 'bind', '~> 2.3.1'
|
- 'bind', '~> 2.3.1'
|
||||||
- 'openstackclient'
|
- 'openstackclient'
|
||||||
- 'openstack-common', '>= 19.0.0'
|
- 'openstack-common', '>= 20.0.0'
|
||||||
- 'openstack-image', '>= 19.0.0'
|
- 'openstack-dns', '>= 20.0.0'
|
||||||
|
- 'openstack-image', '>= 20.0.0'
|
||||||
- 'resolver'
|
- 'resolver'
|
||||||
|
|
||||||
Recipes
|
Recipes
|
||||||
|
|
10
metadata.rb
10
metadata.rb
|
@ -3,7 +3,7 @@ maintainer 'openstack-chef'
|
||||||
maintainer_email 'openstack-discuss@lists.openstack.org'
|
maintainer_email 'openstack-discuss@lists.openstack.org'
|
||||||
license 'Apache-2.0'
|
license 'Apache-2.0'
|
||||||
description 'Installs and configures the Tempest Integration Test Suite'
|
description 'Installs and configures the Tempest Integration Test Suite'
|
||||||
version '19.0.0'
|
version '20.0.0'
|
||||||
|
|
||||||
%w(ubuntu redhat centos).each do |os|
|
%w(ubuntu redhat centos).each do |os|
|
||||||
supports os
|
supports os
|
||||||
|
@ -11,11 +11,11 @@ end
|
||||||
|
|
||||||
depends 'bind', '~> 2.3.1'
|
depends 'bind', '~> 2.3.1'
|
||||||
depends 'openstackclient'
|
depends 'openstackclient'
|
||||||
depends 'openstack-common', '>= 19.0.0'
|
depends 'openstack-common', '>= 20.0.0'
|
||||||
depends 'openstack-dns', '>= 19.0.0'
|
depends 'openstack-dns', '>= 20.0.0'
|
||||||
depends 'openstack-image', '>= 19.0.0'
|
depends 'openstack-image', '>= 20.0.0'
|
||||||
depends 'resolver'
|
depends 'resolver'
|
||||||
|
|
||||||
issues_url 'https://launchpad.net/openstack-chef'
|
issues_url 'https://launchpad.net/openstack-chef'
|
||||||
source_url 'https://opendev.org/openstack/cookbook-openstack-integration-test'
|
source_url 'https://opendev.org/openstack/cookbook-openstack-integration-test'
|
||||||
chef_version '>= 15.0'
|
chef_version '>= 15.8'
|
||||||
|
|
|
@ -26,8 +26,6 @@ execute 'run_tempest' do
|
||||||
end
|
end
|
||||||
|
|
||||||
# Run tempest after everything else.
|
# Run tempest after everything else.
|
||||||
log 'start_tempest' do
|
notify_group 'start_tempest' do
|
||||||
message 'Starting tempest at the very end.'
|
|
||||||
level :info
|
|
||||||
notifies :run, 'execute[run_tempest]', :delayed
|
notifies :run, 'execute[run_tempest]', :delayed
|
||||||
end
|
end
|
||||||
|
|
|
@ -55,7 +55,7 @@ connection_params = {
|
||||||
openstack_endpoint_type: endpoint_type,
|
openstack_endpoint_type: endpoint_type,
|
||||||
}
|
}
|
||||||
|
|
||||||
%w(user1 user2).each_with_index do |user|
|
%w(user1 user2).each do |user|
|
||||||
service_user = node['openstack']['integration-test'][user]['user_name']
|
service_user = node['openstack']['integration-test'][user]['user_name']
|
||||||
service_project = node['openstack']['integration-test'][user]['project_name']
|
service_project = node['openstack']['integration-test'][user]['project_name']
|
||||||
service_role = node['openstack']['integration-test'][user]['role']
|
service_role = node['openstack']['integration-test'][user]['role']
|
||||||
|
|
Loading…
Reference in New Issue