Style and lint fixes for newer chefdk, deprecated Gemfile

- Removed ancient Gemfile
- Style and lint fixes to support newer chefdk
- Rewrote metadata.rb for readability

Change-Id: Ie61ae3ca685738fe1de98fc9223d3e39535ce000
This commit is contained in:
Samuel Cassiba 2017-08-02 01:39:22 -04:00
parent 7bc24a21a4
commit 5d7a11aeb3
8 changed files with 35 additions and 42 deletions

View File

@ -1,11 +1,16 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2017-02-23 16:58:30 +0100 using RuboCop version 0.39.0.
# on 2017-08-02 01:39:01 -0400 using RuboCop version 0.47.1.
# 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: 16
# Configuration parameters: CountComments, ExcludedMethods.
Metrics/BlockLength:
Max: 198
# Offense count: 1
# Configuration parameters: CountComments.
Metrics/MethodLength:

14
Gemfile
View File

@ -1,14 +0,0 @@
## THIS GEMFILE IS DEPRECATED AND WILL BE REMOVED AFTER THE NEXT RELEASE
## THERE WON'T BE ANY UPDATES TO THIS FILE DURING THIS RELEASE CYCLE
## WE SWITCHED TO CHEFDK AS THE BUNDLE FOR THE NEEDED GEMS
source 'https://rubygems.org'
gem 'chef', '~> 11.18.6'
gem 'json', '<= 1.7.7' # chef 11 dependency
gem 'berkshelf', '~> 3.2.1'
gem 'hashie', '~> 2.0'
gem 'chefspec', '~> 4.0.0'
gem 'rspec', '~> 3.0.0'
gem 'foodcritic', '~> 4.0'
gem 'rubocop', '~> 0.29.1'

View File

@ -1,12 +1,10 @@
name 'openstack-image'
maintainer 'openstack-chef'
name 'openstack-image'
maintainer 'openstack-chef'
maintainer_email 'openstack-dev@lists.openstack.org'
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)
license 'Apache 2.0'
description 'Installs and configures the Glance Image Registry and Delivery Service'
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 '15.0.0'
version '15.0.0'
%w(ubuntu redhat centos).each do |os|
supports os
@ -15,3 +13,7 @@ end
depends 'openstackclient'
depends 'openstack-common', '>= 15.0.0'
depends 'openstack-identity', '>= 15.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)
chef_version '>= 12.5' if respond_to?(:chef_version)

View File

@ -43,13 +43,13 @@ end
directory '/etc/glance' do
owner node['openstack']['image']['user']
group node['openstack']['image']['group']
mode 00700
mode 0o0700
end
directory node['openstack']['image_api']['conf']['keystone_authtoken']['signing_dir'] do
owner node['openstack']['image']['user']
group node['openstack']['image']['group']
mode 00700
mode 0o0700
recursive true
end
@ -59,7 +59,7 @@ if node['openstack']['image_api']['conf']['glance_store']['default_store'] == 'f
directory node['openstack']['image_api']['conf']['glance_store']['filesystem_store_datadir'] do
owner node['openstack']['image']['user']
group node['openstack']['image']['group']
mode 00750
mode 0o0750
recursive true
end
end
@ -118,7 +118,7 @@ template '/etc/glance/glance-api.conf' do
cookbook 'openstack-common'
owner node['openstack']['image']['user']
group node['openstack']['image']['group']
mode 00640
mode 0o0640
variables(
service_config: glance_api_conf
)
@ -129,7 +129,7 @@ template '/etc/glance/glance-cache.conf' do
cookbook 'openstack-common'
owner node['openstack']['image']['user']
group node['openstack']['image']['group']
mode 00640
mode 0o0640
variables(
service_config: glance_cache_conf
)
@ -140,7 +140,7 @@ template '/etc/glance/glance-scrubber.conf' do
cookbook 'openstack-common'
owner node['openstack']['image']['user']
group node['openstack']['image']['group']
mode 00640
mode 0o0640
variables(
service_config: glance_scrubber_conf
)
@ -174,7 +174,7 @@ directory node['openstack']['image']['cache']['dir'] do
owner node['openstack']['image']['user']
group node['openstack']['image']['group']
recursive true
mode 00755
mode 0o0755
end
service 'glance-api' do

View File

@ -68,7 +68,7 @@ end
directory node['openstack']['image_registry']['conf']['keystone_authtoken']['signing_dir'] do
owner glance_user
group glance_group
mode 00700
mode 0o0700
recursive true
end
@ -94,7 +94,7 @@ template '/etc/glance/glance-registry.conf' do
cookbook 'openstack-common'
owner node['openstack']['image']['user']
group node['openstack']['image']['group']
mode 00640
mode 0o0640
variables(
service_config: glance_registry_conf_options
)

View File

@ -24,7 +24,7 @@ describe 'openstack-image::api' do
.with(
user: 'glance',
group: 'glance',
mode: 00700
mode: 0o0700
)
end
@ -33,7 +33,7 @@ describe 'openstack-image::api' do
.with(
user: 'glance',
group: 'glance',
mode: 00750,
mode: 0o0750,
recursive: true
)
end
@ -43,7 +43,7 @@ describe 'openstack-image::api' do
.with(
user: 'glance',
group: 'glance',
mode: 00700,
mode: 0o0700,
recursive: true
)
end
@ -57,7 +57,7 @@ describe 'openstack-image::api' do
cookbook: 'openstack-common',
user: 'glance',
group: 'glance',
mode: 00640
mode: 0o0640
)
end
@ -131,7 +131,7 @@ describe 'openstack-image::api' do
cookbook: 'openstack-common',
user: 'glance',
group: 'glance',
mode: 00640
mode: 0o0640
)
end
@ -158,7 +158,7 @@ describe 'openstack-image::api' do
cookbook: 'openstack-common',
user: 'glance',
group: 'glance',
mode: 00640
mode: 0o0640
)
end
@ -197,7 +197,7 @@ describe 'openstack-image::api' do
.with(
user: 'glance',
group: 'glance',
mode: 00755,
mode: 0o0755,
recursive: true
)
end

View File

@ -38,7 +38,7 @@ describe 'openstack-image::registry' do
expect(chef_run).to create_directory('/var/cache/glance/registry').with(
user: 'glance',
group: 'glance',
mode: 00700
mode: 0o0700
)
end
@ -60,7 +60,7 @@ describe 'openstack-image::registry' do
cookbook: 'openstack-common',
user: 'glance',
group: 'glance',
mode: 00640
mode: 0o0640
)
end

View File

@ -105,7 +105,7 @@ shared_examples 'image-lib-cache-directory' do
expect(chef_run).to create_directory(dir.name).with(
user: 'glance',
group: 'glance',
mode: 00755,
mode: 0o0755,
recursive: true
)
end
@ -120,7 +120,7 @@ shared_examples 'glance-directory' do
expect(chef_run).to create_directory(dir.name).with(
user: 'glance',
group: 'glance',
mode: 00700
mode: 0o0700
)
end
end