Style and lint fixes for chefdk, deprecated Gemfile
- Style and lint fixes for newer chefdk - Removed ancient Gemfile - Rewrote metadata.rb for readability Change-Id: Iba9ba7110dfde7635edc6706ecbbafbdbb161002
This commit is contained in:
parent
5578a44ee7
commit
76ee6952af
|
@ -1,11 +1,16 @@
|
|||
# This configuration was generated by
|
||||
# `rubocop --auto-gen-config`
|
||||
# on 2017-02-23 16:58:38 +0100 using RuboCop version 0.39.0.
|
||||
# on 2017-08-02 02:00:35 -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: 20
|
||||
# Configuration parameters: CountComments, ExcludedMethods.
|
||||
Metrics/BlockLength:
|
||||
Max: 208
|
||||
|
||||
# Offense count: 4
|
||||
# Configuration parameters: EnforcedStyle, SupportedStyles.
|
||||
# SupportedStyles: nested, compact
|
||||
|
|
14
Gemfile
14
Gemfile
|
@ -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'
|
17
metadata.rb
17
metadata.rb
|
@ -1,12 +1,10 @@
|
|||
name 'openstack-telemetry'
|
||||
maintainer 'openstack-chef'
|
||||
name 'openstack-telemetry'
|
||||
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-telemetry' if respond_to?(:source_url)
|
||||
license 'Apache 2.0'
|
||||
description 'The OpenStack Metering service Ceilometer.'
|
||||
license 'Apache 2.0'
|
||||
description 'The OpenStack Metering service Ceilometer.'
|
||||
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
|
||||
version '15.0.0'
|
||||
version '15.0.0'
|
||||
|
||||
recipe 'openstack-telemetry::agent-central', 'Installs agent central service.'
|
||||
recipe 'openstack-telemetry::agent-compute', 'Installs agent compute service.'
|
||||
|
@ -26,4 +24,9 @@ end
|
|||
depends 'openstack-common', '>= 15.0.0'
|
||||
depends 'openstack-identity', '>= 15.0.0'
|
||||
depends 'openstackclient'
|
||||
|
||||
depends 'apache2', '~> 3.2'
|
||||
|
||||
issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url)
|
||||
source_url 'https://github.com/openstack/cookbook-openstack-telemetry' if respond_to?(:source_url)
|
||||
chef_version '>= 12.5' if respond_to?(:chef_version)
|
||||
|
|
|
@ -65,7 +65,7 @@ ceilometer_apache_dir = "#{node['apache']['docroot_dir']}/ceilometer"
|
|||
directory ceilometer_apache_dir do
|
||||
owner 'root'
|
||||
group 'root'
|
||||
mode 00755
|
||||
mode 0o0755
|
||||
end
|
||||
|
||||
ceilometer_server_entry = "#{ceilometer_apache_dir}/app"
|
||||
|
@ -75,7 +75,7 @@ file ceilometer_server_entry do
|
|||
content lazy { IO.read(platform['ceilometer-api_wsgi_file']) }
|
||||
owner 'root'
|
||||
group 'root'
|
||||
mode 00755
|
||||
mode 0o0755
|
||||
end
|
||||
|
||||
web_app 'ceilometer-api' do
|
||||
|
|
|
@ -82,14 +82,14 @@ end
|
|||
directory node['openstack']['telemetry']['conf_dir'] do
|
||||
owner node['openstack']['telemetry']['user']
|
||||
group node['openstack']['telemetry']['group']
|
||||
mode 00750
|
||||
mode 0o0750
|
||||
action :create
|
||||
end
|
||||
|
||||
directory "#{node['apache']['run_dir']}/ceilometer" do
|
||||
owner node['openstack']['telemetry']['user']
|
||||
group node['openstack']['telemetry']['group']
|
||||
mode 00750
|
||||
mode 0o0750
|
||||
recursive true
|
||||
action :create
|
||||
end
|
||||
|
@ -102,7 +102,7 @@ template node['openstack']['telemetry']['conf_file'] do
|
|||
cookbook 'openstack-common'
|
||||
owner node['openstack']['telemetry']['user']
|
||||
group node['openstack']['telemetry']['group']
|
||||
mode 00640
|
||||
mode 0o0640
|
||||
variables(
|
||||
service_config: ceilometer_conf_options
|
||||
)
|
||||
|
|
|
@ -54,7 +54,7 @@ template node['openstack']['telemetry-metric']['conf_file'] do
|
|||
cookbook 'openstack-common'
|
||||
owner node['openstack']['telemetry-metric']['user']
|
||||
group node['openstack']['telemetry-metric']['group']
|
||||
mode 00640
|
||||
mode 0o0640
|
||||
variables(
|
||||
service_config: gnocchi_conf_options
|
||||
)
|
||||
|
@ -66,7 +66,7 @@ cookbook_file File.join(node['openstack']['telemetry']['conf_dir'], 'gnocchi_res
|
|||
source 'gnocchi_resources.yaml'
|
||||
owner node['openstack']['telemetry']['user']
|
||||
group node['openstack']['telemetry']['group']
|
||||
mode 00640
|
||||
mode 0o0640
|
||||
end
|
||||
|
||||
# drop api-paste.ini to gnocchi folder (default ini will not use keystone auth)
|
||||
|
@ -74,7 +74,7 @@ cookbook_file File.join(node['openstack']['telemetry-metric']['conf_dir'], 'api-
|
|||
source 'api-paste.ini'
|
||||
owner node['openstack']['telemetry-metric']['user']
|
||||
group node['openstack']['telemetry-metric']['group']
|
||||
mode 00640
|
||||
mode 0o0640
|
||||
end
|
||||
|
||||
if node['openstack']['telemetry-metric']['conf']['storage']['driver'] == 'file'
|
||||
|
@ -87,7 +87,7 @@ if node['openstack']['telemetry-metric']['conf']['storage']['driver'] == 'file'
|
|||
owner node['openstack']['telemetry-metric']['user']
|
||||
group node['openstack']['telemetry-metric']['group']
|
||||
recursive true
|
||||
mode 00750
|
||||
mode 0o0750
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -119,7 +119,7 @@ gnocchi_apache_dir = "#{node['apache']['docroot_dir']}/gnocchi"
|
|||
directory gnocchi_apache_dir do
|
||||
owner 'root'
|
||||
group 'root'
|
||||
mode 00755
|
||||
mode 0o0755
|
||||
end
|
||||
|
||||
gnocchi_server_entry = "#{gnocchi_apache_dir}/app"
|
||||
|
@ -129,7 +129,7 @@ file gnocchi_server_entry do
|
|||
content lazy { IO.read(platform['gnocchi-api_wsgi_file']) }
|
||||
owner 'root'
|
||||
group 'root'
|
||||
mode 00755
|
||||
mode 0o0755
|
||||
end
|
||||
|
||||
web_app 'gnocchi-api' do
|
||||
|
|
|
@ -35,7 +35,7 @@ describe 'openstack-telemetry::api' do
|
|||
expect(chef_run).to create_directory('/var/www/html/ceilometer').with(
|
||||
user: 'root',
|
||||
group: 'root',
|
||||
mode: 00755
|
||||
mode: 0o0755
|
||||
)
|
||||
end
|
||||
|
||||
|
@ -43,7 +43,7 @@ describe 'openstack-telemetry::api' do
|
|||
expect(chef_run).to create_file('/var/www/html/ceilometer/app').with(
|
||||
user: 'root',
|
||||
group: 'root',
|
||||
mode: 00755
|
||||
mode: 0o0755
|
||||
)
|
||||
end
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@ describe 'openstack-telemetry::common' do
|
|||
expect(chef_run).to create_directory(dir.name).with(
|
||||
user: 'ceilometer',
|
||||
group: 'ceilometer',
|
||||
mode: 0750
|
||||
mode: 0o750
|
||||
)
|
||||
end
|
||||
end
|
||||
|
@ -52,7 +52,7 @@ describe 'openstack-telemetry::common' do
|
|||
expect(chef_run).to create_template(file.name).with(
|
||||
user: 'ceilometer',
|
||||
group: 'ceilometer',
|
||||
mode: 0640
|
||||
mode: 0o640
|
||||
)
|
||||
end
|
||||
|
||||
|
@ -127,7 +127,7 @@ describe 'openstack-telemetry::common' do
|
|||
expect(chef_run).to render_config_file(file.name)
|
||||
.with_section_content(
|
||||
'database',
|
||||
%r{^connection = mysql://ceilometer:ceilometer-dbpass@127\.0\.0\.1:3306/ceilometer\?charset=utf8$}
|
||||
%(connection = mysql+pymysql://ceilometer:ceilometer-dbpass@127.0.0.1:3306/ceilometer?charset=utf8)
|
||||
)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -15,7 +15,7 @@ describe 'openstack-telemetry::gnocchi_configure' do
|
|||
expect(chef_run).to create_template(file.name).with(
|
||||
user: 'gnocchi',
|
||||
group: 'gnocchi',
|
||||
mode: 0640
|
||||
mode: 0o640
|
||||
)
|
||||
end
|
||||
|
||||
|
@ -49,7 +49,7 @@ describe 'openstack-telemetry::gnocchi_configure' do
|
|||
expect(chef_run).to render_config_file(file.name)
|
||||
.with_section_content(
|
||||
'database',
|
||||
%r{^connection = mysql://gnocchi:gnocchi-dbpass@127\.0\.0\.1:3306/gnocchi\?charset=utf8$}
|
||||
%(connection = mysql+pymysql://gnocchi:gnocchi-dbpass@127.0.0.1:3306/gnocchi?charset=utf8)
|
||||
)
|
||||
end
|
||||
|
||||
|
@ -57,7 +57,7 @@ describe 'openstack-telemetry::gnocchi_configure' do
|
|||
expect(chef_run).to render_config_file(file.name)
|
||||
.with_section_content(
|
||||
'indexer',
|
||||
%r{^url = mysql://gnocchi:gnocchi-dbpass@127\.0\.0\.1:3306/gnocchi\?charset=utf8$}
|
||||
%(url = mysql+pymysql://gnocchi:gnocchi-dbpass@127.0.0.1:3306/gnocchi?charset=utf8)
|
||||
)
|
||||
end
|
||||
end
|
||||
|
@ -68,7 +68,7 @@ describe 'openstack-telemetry::gnocchi_configure' do
|
|||
source: 'gnocchi_resources.yaml',
|
||||
owner: 'ceilometer',
|
||||
group: 'ceilometer',
|
||||
mode: 00640
|
||||
mode: 0o0640
|
||||
)
|
||||
end
|
||||
|
||||
|
@ -78,7 +78,7 @@ describe 'openstack-telemetry::gnocchi_configure' do
|
|||
source: 'api-paste.ini',
|
||||
owner: 'gnocchi',
|
||||
group: 'gnocchi',
|
||||
mode: 00640
|
||||
mode: 0o0640
|
||||
)
|
||||
end
|
||||
|
||||
|
@ -90,7 +90,7 @@ describe 'openstack-telemetry::gnocchi_configure' do
|
|||
.with(
|
||||
user: 'gnocchi',
|
||||
group: 'gnocchi',
|
||||
mode: 0750
|
||||
mode: 0o750
|
||||
)
|
||||
end
|
||||
end
|
||||
|
@ -103,7 +103,7 @@ describe 'openstack-telemetry::gnocchi_configure' do
|
|||
.with(
|
||||
user: 'gnocchi',
|
||||
group: 'gnocchi',
|
||||
mode: 0750
|
||||
mode: 0o750
|
||||
)
|
||||
end
|
||||
end
|
||||
|
@ -143,7 +143,7 @@ describe 'openstack-telemetry::gnocchi_configure' do
|
|||
expect(chef_run).to create_directory('/var/www/html/gnocchi').with(
|
||||
user: 'root',
|
||||
group: 'root',
|
||||
mode: 00755
|
||||
mode: 0o0755
|
||||
)
|
||||
end
|
||||
|
||||
|
@ -151,7 +151,7 @@ describe 'openstack-telemetry::gnocchi_configure' do
|
|||
expect(chef_run).to create_file('/var/www/html/gnocchi/app').with(
|
||||
user: 'root',
|
||||
group: 'root',
|
||||
mode: 00755
|
||||
mode: 0o0755
|
||||
)
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue