starting rocky development patch

Change-Id: Ie7c681548a902ecc050e204e873188eb547a281e
This commit is contained in:
Samuel Cassiba 2018-08-03 06:30:40 -07:00
parent 94e56a4138
commit 13902fe451
7 changed files with 41 additions and 18 deletions

View File

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

21
.rubocop_todo.yml Normal file
View File

@ -0,0 +1,21 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2018-08-03 05:26:12 -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: 3
# Cop supports --auto-correct.
Style/IfUnlessModifier:
Exclude:
- 'attributes/gnocchi_conf.rb'
- 'recipes/aodh.rb'
- 'recipes/common.rb'
# Offense count: 80
# 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,7 +4,7 @@ maintainer_email 'openstack-dev@lists.openstack.org'
license 'Apache-2.0'
description 'The OpenStack Metering service Ceilometer.'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '17.0.0'
version '18.0.0'
recipe 'openstack-telemetry::agent-central', 'Installs agent central service.'
recipe 'openstack-telemetry::agent-compute', 'Installs agent compute service.'
@ -21,8 +21,8 @@ recipe 'openstack-telemetry::identity_registration', 'Registers the endpoints, t
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'
depends 'apache2'

View File

@ -26,7 +26,7 @@ describe 'openstack-telemetry::api' do
end
it 'include apache recipes' do
node.set['openstack']['telemetry']['ssl']['enabled'] = true
node.override['openstack']['telemetry']['ssl']['enabled'] = true
expect(chef_run).to include_recipe('apache2::mod_ssl')
end
end
@ -58,7 +58,7 @@ describe 'openstack-telemetry::api' do
end
it "configures #{file} common lines" do
node.set['openstack']['telemetry']['custom_template_banner'] = 'custom_template_banner_value'
node.override['openstack']['telemetry']['custom_template_banner'] = 'custom_template_banner_value'
[/user=ceilometer/,
/group=ceilometer/,
%r{^ ErrorLog /var/log/apache2/ceilometer-api_error.log$},
@ -75,7 +75,7 @@ describe 'openstack-telemetry::api' do
end
context 'Enable SSL' do
before do
node.set['openstack']['telemetry']['ssl']['enabled'] = true
node.override['openstack']['telemetry']['ssl']['enabled'] = true
end
it "configures #{file} common ssl lines" do
[/^ SSLEngine On$/,
@ -94,17 +94,17 @@ describe 'openstack-telemetry::api' do
end
end
it "configures #{file} chainfile when set" do
node.set['openstack']['telemetry']['ssl']['chainfile'] = '/etc/ceilometer/ssl/certs/chainfile.pem'
node.override['openstack']['telemetry']['ssl']['chainfile'] = '/etc/ceilometer/ssl/certs/chainfile.pem'
expect(chef_run).to render_file(file)
.with_content(%r{^ SSLCertificateChainFile /etc/ceilometer/ssl/certs/chainfile.pem$})
end
it "configures #{file} ciphers when set" do
node.set['openstack']['telemetry']['ssl']['ciphers'] = 'ciphers_value'
node.override['openstack']['telemetry']['ssl']['ciphers'] = 'ciphers_value'
expect(chef_run).to render_file(file)
.with_content(/^ SSLCipherSuite ciphers_value$/)
end
it "configures #{file} cert_required set" do
node.set['openstack']['telemetry']['ssl']['cert_required'] = true
node.override['openstack']['telemetry']['ssl']['cert_required'] = true
expect(chef_run).to render_file(file)
.with_content(/^ SSLVerifyClient require$/)
end

View File

@ -12,7 +12,7 @@ describe 'openstack-telemetry::common' do
context 'with logging enabled' do
before do
node.set['openstack']['telemetry']['syslog']['use'] = true
node.override['openstack']['telemetry']['syslog']['use'] = true
end
it 'runs logging recipe' do

View File

@ -106,7 +106,7 @@ describe 'openstack-telemetry::gnocchi_configure' do
end
context 'other storage backend' do
before do
node.set['openstack']['telemetry-metric']['conf']['storage']['driver'] = 'ceph'
node.override['openstack']['telemetry-metric']['conf']['storage']['driver'] = 'ceph'
end
it do
expect(chef_run).to_not create_directory("/var/lib/gnocchi/#{dir}")
@ -144,7 +144,7 @@ describe 'openstack-telemetry::gnocchi_configure' do
end
it 'include apache recipes' do
node.set['openstack']['identity']['ssl']['enabled'] = true
node.override['openstack']['identity']['ssl']['enabled'] = true
expect(chef_run).to include_recipe('apache2::mod_ssl')
end
end
@ -176,7 +176,7 @@ describe 'openstack-telemetry::gnocchi_configure' do
end
it "configures #{file} common lines" do
node.set['openstack']['telemetry-metric']['custom_template_banner'] = 'custom_template_banner_value'
node.override['openstack']['telemetry-metric']['custom_template_banner'] = 'custom_template_banner_value'
[/user=gnocchi/,
/group=gnocchi/,
%r{^ ErrorLog /var/log/apache2/gnocchi-api_error.log$},
@ -193,7 +193,7 @@ describe 'openstack-telemetry::gnocchi_configure' do
end
context 'Enable SSL' do
before do
node.set['openstack']['telemetry-metric']['ssl']['enabled'] = true
node.override['openstack']['telemetry-metric']['ssl']['enabled'] = true
end
it "configures #{file} common ssl lines" do
[/^ SSLEngine On$/,
@ -212,17 +212,17 @@ describe 'openstack-telemetry::gnocchi_configure' do
end
end
it "configures #{file} chainfile when set" do
node.set['openstack']['telemetry-metric']['ssl']['chainfile'] = '/etc/ceilometer/ssl/certs/chainfile.pem'
node.override['openstack']['telemetry-metric']['ssl']['chainfile'] = '/etc/ceilometer/ssl/certs/chainfile.pem'
expect(chef_run).to render_file(file)
.with_content(%r{^ SSLCertificateChainFile /etc/ceilometer/ssl/certs/chainfile.pem$})
end
it "configures #{file} ciphers when set" do
node.set['openstack']['telemetry-metric']['ssl']['ciphers'] = 'ciphers_value'
node.override['openstack']['telemetry-metric']['ssl']['ciphers'] = 'ciphers_value'
expect(chef_run).to render_file(file)
.with_content(/^ SSLCipherSuite ciphers_value$/)
end
it "configures #{file} cert_required set" do
node.set['openstack']['telemetry-metric']['ssl']['cert_required'] = true
node.override['openstack']['telemetry-metric']['ssl']['cert_required'] = true
expect(chef_run).to render_file(file)
.with_content(/^ SSLVerifyClient require$/)
end