starting rocky development patch

Change-Id: Id6bde5efcf7574d6718301ffd02854418b34cf04
This commit is contained in:
Samuel Cassiba 2018-08-03 06:38:29 -07:00
parent e7f5813c75
commit 6e9924ea12
7 changed files with 53 additions and 39 deletions

View File

@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2017-08-25 09:41:52 -0400 using RuboCop version 0.47.1.
# on 2018-08-03 05:26:00 -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
@ -10,3 +10,17 @@
# Configuration parameters: CountKeywordArgs.
Metrics/ParameterLists:
Max: 6
# Offense count: 5
# Cop supports --auto-correct.
Style/IfUnlessModifier:
Exclude:
- 'recipes/api.rb'
- 'recipes/image_upload.rb'
- 'recipes/registry.rb'
# Offense count: 97
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
# URISchemes: http, https
Metrics/LineLength:
Max: 327

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,15 +4,15 @@ maintainer_email 'openstack-dev@lists.openstack.org'
license 'Apache-2.0'
description 'Installs and configures the Glance Image Registry and Delivery 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 'openstackclient'
depends 'openstack-common', '>= 17.0.0'
depends 'openstack-identity', '>= 17.0.0'
depends 'openstack-common', '>= 18.0.0'
depends 'openstack-identity', '>= 18.0.0'
issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url)
source_url 'https://github.com/openstack/cookbook-openstack-image' if respond_to?(:source_url)

View File

@ -32,14 +32,14 @@ describe 'openstack-image::image_upload' do
end
it 'raises error for unsupported image extension type' do
node.set['openstack']['image']['upload_images'] = ['image1']
node.set['openstack']['image']['upload_image']['image1'] = 'http://download.net/image.xxx'
node.override['openstack']['image']['upload_images'] = ['image1']
node.override['openstack']['image']['upload_image']['image1'] = 'http://download.net/image.xxx'
expect { chef_run }.to raise_error(ArgumentError)
end
it 'uploads the tar image' do
node.set['openstack']['image']['upload_images'] = ['imageName']
node.set['openstack']['image']['upload_image']['imageName'] = 'http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-uec.tar.gz'
node.override['openstack']['image']['upload_images'] = ['imageName']
node.override['openstack']['image']['upload_image']['imageName'] = 'http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-uec.tar.gz'
stub_command('glance --insecure --os-username admin --os-password admin-pass --os-project-name admin --os-image-url http://127.0.0.1:9292 --os-auth-url http://127.0.0.1:5000/v3 --os-user-domain-name Default --os-project-domain-name Default image-list | grep imageName').and_return(false)
expect(chef_run).to upload_openstack_image_image('Image setup for imageName').with(
image_url: 'http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-uec.tar.gz',
@ -52,9 +52,9 @@ describe 'openstack-image::image_upload' do
%w(vhd vmdk vdi iso raw).each do |image_type|
it "uploads the #{image_type} image" do
node.set['openstack']['image']['upload_images'] = ["#{image_type}_imageName"]
node.set['openstack']['image']['upload_image']["#{image_type}_imageName"] = "image_file.#{image_type}"
node.set['openstack']['image']['upload_image_type']["#{image_type}_imageName"] = image_type.to_s
node.override['openstack']['image']['upload_images'] = ["#{image_type}_imageName"]
node.override['openstack']['image']['upload_image']["#{image_type}_imageName"] = "image_file.#{image_type}"
node.override['openstack']['image']['upload_image_type']["#{image_type}_imageName"] = image_type.to_s
stub_command("glance --insecure --os-username admin --os-password admin-pass --os-project-name admin --os-image-url http://127.0.0.1:9292 --os-auth-url http://127.0.0.1:5000/v3 --os-user-domain-name Default --os-project-domain-name Default image-list | grep #{image_type}_imageName").and_return(false)
expect(chef_run).to upload_openstack_image_image("Image setup for #{image_type}_imageName").with(
image_url: "image_file.#{image_type}",
@ -66,11 +66,11 @@ describe 'openstack-image::image_upload' do
end
it 'uploads the raw and vdi images' do
node.set['openstack']['image']['upload_images'] = ['raw_imageName', 'vdi_imageName']
node.set['openstack']['image']['upload_image']['raw_imageName'] = 'image_file.raw'
node.set['openstack']['image']['upload_image_type']['raw_imageName'] = 'raw'
node.set['openstack']['image']['upload_image']['vdi_imageName'] = 'image_file.vdi'
node.set['openstack']['image']['upload_image_type']['vdi_imageName'] = 'vdi'
node.override['openstack']['image']['upload_images'] = ['raw_imageName', 'vdi_imageName']
node.override['openstack']['image']['upload_image']['raw_imageName'] = 'image_file.raw'
node.override['openstack']['image']['upload_image_type']['raw_imageName'] = 'raw'
node.override['openstack']['image']['upload_image']['vdi_imageName'] = 'image_file.vdi'
node.override['openstack']['image']['upload_image_type']['vdi_imageName'] = 'vdi'
stub_command('glance --insecure --os-username admin --os-password admin-pass --os-project-name admin --os-image-url http://127.0.0.1:9292 --os-auth-url http://127.0.0.1:5000/v3 --os-user-domain-name Default --os-project-domain-name Default image-list | grep raw_imageName').and_return(false)
stub_command('glance --insecure --os-username admin --os-password admin-pass --os-project-name admin --os-image-url http://127.0.0.1:9292 --os-auth-url http://127.0.0.1:5000/v3 --os-user-domain-name Default --os-project-domain-name Default image-list | grep vdi_imageName').and_return(false)
expect(chef_run).to upload_openstack_image_image('Image setup for raw_imageName').with(

View File

@ -12,7 +12,7 @@ describe 'openstack-image::registry' do
include_context 'image-stubs'
it 'converges when configured to use sqlite' do
node.set['openstack']['db']['image']['service_type'] = 'sqlite'
node.override['openstack']['db']['image']['service_type'] = 'sqlite'
expect { chef_run }.to_not raise_error
end

View File

@ -18,7 +18,7 @@ describe 'openstack-image::registry' do
include_context 'image-stubs'
it 'converges when configured to use sqlite' do
node.set['openstack']['db']['image']['service_type'] = 'sqlite'
node.override['openstack']['db']['image']['service_type'] = 'sqlite'
expect { chef_run }.to_not raise_error
end
@ -28,8 +28,8 @@ describe 'openstack-image::registry' do
%w(db2 postgresql).each do |service_type|
it "upgrades #{service_type} python packages if chosen" do
node.set['openstack']['db']['image']['service_type'] = service_type
node.set['openstack']['db']['python_packages'][service_type] = ["my-#{service_type}-py"]
node.override['openstack']['db']['image']['service_type'] = service_type
node.override['openstack']['db']['python_packages'][service_type] = ["my-#{service_type}-py"]
expect(chef_run).to upgrade_package("my-#{service_type}-py")
end
end
@ -47,7 +47,7 @@ describe 'openstack-image::registry' do
end
it 'does not delete glance.sqlite when configured to use sqlite' do
node.set['openstack']['db']['image']['service_type'] = 'sqlite'
node.override['openstack']['db']['image']['service_type'] = 'sqlite'
expect(chef_run).not_to delete_file('/var/lib/glance/glance.sqlite')
end
@ -127,7 +127,7 @@ describe 'openstack-image::registry' do
end
it 'does not run migrations when openstack/image/db/migrate is false' do
node.set['openstack']['db']['image']['migrate'] = false
node.override['openstack']['db']['image']['migrate'] = false
expect(chef_run).not_to run_execute(cmd)
end
end

View File

@ -77,7 +77,7 @@ shared_examples 'common-logging-recipe' do
end
it 'includes logging recipe if openstack/image/syslog/use attribute is true' do
node.set['openstack']['image']['syslog']['use'] = true
node.override['openstack']['image']['syslog']['use'] = true
expect(chef_run).to include_recipe('openstack-common::logging')
end
@ -93,8 +93,8 @@ shared_examples 'common-packages' do
end
it 'honors the platform name and option package overrides' do
node.set['openstack']['image']['platform']['package_overrides'] = '-o Dpkg::Options:: = \'--force-confold\' -o Dpkg::Options:: = \'--force-confdef\' --force-yes'
node.set['openstack']['image']['platform']['image_packages'] = ['my-glance']
node.override['openstack']['image']['platform']['package_overrides'] = '-o Dpkg::Options:: = \'--force-confold\' -o Dpkg::Options:: = \'--force-confdef\' --force-yes'
node.override['openstack']['image']['platform']['image_packages'] = ['my-glance']
expect(chef_run).to upgrade_package('my-glance').with(options: '-o Dpkg::Options:: = \'--force-confold\' -o Dpkg::Options:: = \'--force-confdef\' --force-yes')
end
@ -131,7 +131,7 @@ end
shared_examples 'custom template banner displayer' do
it 'shows the custom banner' do
node.set['openstack']['image']['custom_template_banner'] = 'custom_template_banner_value'
node.override['openstack']['image']['custom_template_banner'] = 'custom_template_banner_value'
expect(chef_run).to render_file(file_name).with_content(/^custom_template_banner_value$/)
end
end
@ -146,7 +146,7 @@ end
shared_context 'sql-stubs' do
before do
node.set['openstack']['db']['image']['username'] = 'db_username_value'
node.override['openstack']['db']['image']['username'] = 'db_username_value'
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
.with('db', 'glance')
.and_return('db_password_value')
@ -158,12 +158,12 @@ end
shared_examples 'syslog use' do
it 'shows log_config if syslog use is enabled' do
node.set['openstack']['image']['syslog']['use'] = true
node.override['openstack']['image']['syslog']['use'] = true
expect(chef_run).to render_file(file.name).with_content(%r{^log_config = /etc/openstack/logging.conf$})
end
it 'shows log_file if syslog use is disabled' do
node.set['openstack']['image']['syslog']['use'] = false
node.override['openstack']['image']['syslog']['use'] = false
expect(chef_run).to render_file(file.name).with_content(%r{^log_file = /var/log/glance/#{log_file_name}$})
end
end
@ -175,14 +175,14 @@ shared_examples 'keystone attribute setter' do |version|
context 'auth version' do
it 'shows the version attribute if it is different from v3' do
node.set['openstack']['api']['auth']['version'] = 'v3.0'
node.override['openstack']['api']['auth']['version'] = 'v3.0'
expect(chef_run).to render_file(file.name).with_content(/^auth_version = v3.0$/)
end
end
%w(project user).each do |attr|
it "sets the auth admin #{attr} attribute" do
node.set['openstack']["image-#{version}"]['conf']['keystone_authtoken']["admin_#{attr}"] = "service_#{attr}_value"
node.override['openstack']["image-#{version}"]['conf']['keystone_authtoken']["admin_#{attr}"] = "service_#{attr}_value"
expect(chef_run).to render_file(file.name).with_content(/^admin_#{attr} = service_#{attr}_value$/)
end
end
@ -192,7 +192,7 @@ shared_examples 'keystone attribute setter' do |version|
end
it 'sets the signing dir attribute' do
node.set['openstack']["image-#{version}"]['conf']['keystone_authtoken']['signing_dir'] = 'cache_dir_value'
node.override['openstack']["image-#{version}"]['conf']['keystone_authtoken']['signing_dir'] = 'cache_dir_value'
expect(chef_run).to render_file(file.name).with_content(/^signing_dir = cache_dir_value$/)
end
end
@ -200,11 +200,11 @@ end
shared_examples 'messaging' do |version|
context 'messaging' do
before do
node.set['openstack']['image']['notification_driver'] = 'messaging'
node.override['openstack']['image']['notification_driver'] = 'messaging'
end
it 'sets the notifier_strategy attribute' do
node.set['openstack']["image-#{version}"]['conf']['DEFAULT']['notifier_strategy'] = 'default'
node.override['openstack']["image-#{version}"]['conf']['DEFAULT']['notifier_strategy'] = 'default'
expect(chef_run).to render_file(file.name).with_content(/^notifier_strategy = default$/)
end
@ -220,8 +220,8 @@ shared_examples 'messaging' do |version|
context 'rabbitmq' do
before do
node.set['openstack']["image-#{version}"]['conf']['DEFAULT']['rpc_backend'] = 'rabbit'
node.set['openstack']["image-#{version}"]['conf']['oslo_messaging_rabbit']['rabbit_userid'] = 'rabbit_userid_value'
node.override['openstack']["image-#{version}"]['conf']['DEFAULT']['rpc_backend'] = 'rabbit'
node.override['openstack']["image-#{version}"]['conf']['oslo_messaging_rabbit']['rabbit_userid'] = 'rabbit_userid_value'
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
.with('user', 'rabbit_userid_value')
.and_return('rabbit_password_value')
@ -229,7 +229,7 @@ shared_examples 'messaging' do |version|
%w(host port userid).each do |attr|
it "sets the rabbitmq #{attr} attribute" do
node.set['openstack']["image-#{version}"]['conf']['oslo_messaging_rabbit']["rabbit_#{attr}"] = "rabbit_#{attr}_value"
node.override['openstack']["image-#{version}"]['conf']['oslo_messaging_rabbit']["rabbit_#{attr}"] = "rabbit_#{attr}_value"
expect(chef_run).to render_config_file(file_name).with_section_content('oslo_messaging_rabbit', /^rabbit_#{attr} = rabbit_#{attr}_value$/)
end
end
@ -239,7 +239,7 @@ shared_examples 'messaging' do |version|
end
it 'sets the rabbitmq vhost' do
node.set['openstack']["image-#{version}"]['conf']['oslo_messaging_rabbit']['rabbit_virtual_host'] = 'rabbit_vhost_value'
node.override['openstack']["image-#{version}"]['conf']['oslo_messaging_rabbit']['rabbit_virtual_host'] = 'rabbit_vhost_value'
expect(chef_run).to render_config_file(file_name).with_section_content('oslo_messaging_rabbit', /^rabbit_virtual_host = rabbit_vhost_value$/)
end
end