openstack/cookbook-openstack-telemetry
Code Issues Proposed changes

Moving IRC network reference to OFTC

Browse Source 
Also pull bind cookbook from git to fix version pinning issues and fix ChefSpec.

Change-Id: I4e8122210bfaadd028b80d1a6cbd36dab3e3a83d
Signed-off-by: Lance Albertson <lance@osuosl.org>
This commit is contained in:
Ghanshyam Mann 2021-07-08 08:20:44 -05:00 committed by Lance Albertson
parent e6560486ab
commit e1a21a50b7
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Berksfile
View File

@ -22,4 +22,8 @@ solver :ruby, :required
end end
end end
# TODO(ramereth): Remove after this PR gets included in a release
# https://github.com/joyofhex/cookbook-bind/pull/60
cookbook 'bind', github: 'joyofhex/cookbook-bind'
metadata metadata

2
CONTRIBUTING.md
View File

@ -31,6 +31,6 @@ Contacts
-------- --------
Mailing list: groups.google.com/group/opscode-chef-openstack Mailing list: groups.google.com/group/opscode-chef-openstack
IRC: #openstack-chef is our channel on irc.freenode.net IRC: #openstack-chef is our channel on irc.oftc.net
Wiki: https://wiki.openstack.org/wiki/Chef/GettingStarted and https://docs.getchef.com/openstack.html Wiki: https://wiki.openstack.org/wiki/Chef/GettingStarted and https://docs.getchef.com/openstack.html
Twitter: @chefopenstack Twitter: @chefopenstack

2
metadata.rb
View File

@ -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 'The OpenStack Metering service Ceilometer.' description 'The OpenStack Metering service Ceilometer.'
version '19.1.0' version '19.1.1'
%w(ubuntu redhat centos).each do |os| %w(ubuntu redhat centos).each do |os|
supports os supports os

4
spec/aodh_spec.rb
View File

@ -151,7 +151,7 @@ describe 'openstack-telemetry::aodh' do
key_file: '/etc/ceilometer/ssl/private/sslkey.pem', key_file: '/etc/ceilometer/ssl/private/sslkey.pem',
log_dir: '/var/log/apache2', log_dir: '/var/log/apache2',
protocol: 'All -SSLv2 -SSLv3', protocol: 'All -SSLv2 -SSLv3',
run_dir: '/var/lock/apache2', run_dir: '/var/lock',
server_entry: '/var/www/html/aodh/app', server_entry: '/var/www/html/aodh/app',
server_host: '127.0.0.1', server_host: '127.0.0.1',
server_port: 8042, server_port: 8042,
@ -171,7 +171,7 @@ describe 'openstack-telemetry::aodh' do
/WSGIDaemonProcess aodh-api processes=2 threads=10 user=aodh group=aodh display-name=%{GROUP}$/, /WSGIDaemonProcess aodh-api processes=2 threads=10 user=aodh group=aodh display-name=%{GROUP}$/,
/WSGIProcessGroup aodh-api$/, /WSGIProcessGroup aodh-api$/,
%r{WSGIScriptAlias / /var/www/html/aodh/app$}, %r{WSGIScriptAlias / /var/www/html/aodh/app$},
%r{^WSGISocketPrefix /var/lock/apache2$}, %r{^WSGISocketPrefix /var/lock$},
%r{ErrorLog /var/log/apache2/aodh-api_error.log$}, %r{ErrorLog /var/log/apache2/aodh-api_error.log$},
%r{CustomLog /var/log/apache2/aodh-api_access.log combined$}, %r{CustomLog /var/log/apache2/aodh-api_access.log combined$},
].each do |line| ].each do |line|

4
spec/gnocchi_configure_spec.rb
View File

@ -183,7 +183,7 @@ describe 'openstack-telemetry::gnocchi_configure' do
log_debug: nil, log_debug: nil,
log_dir: '/var/log/apache2', log_dir: '/var/log/apache2',
protocol: 'All -SSLv2 -SSLv3', protocol: 'All -SSLv2 -SSLv3',
run_dir: '/var/lock/apache2', run_dir: '/var/lock',
server_entry: '/var/www/html/gnocchi/app', server_entry: '/var/www/html/gnocchi/app',
server_host: '127.0.0.1', server_host: '127.0.0.1',
server_port: 8041, server_port: 8041,
@ -203,7 +203,7 @@ describe 'openstack-telemetry::gnocchi_configure' do
/WSGIDaemonProcess gnocchi-api processes=2 threads=10 user=gnocchi group=gnocchi display-name=%{GROUP}$/, /WSGIDaemonProcess gnocchi-api processes=2 threads=10 user=gnocchi group=gnocchi display-name=%{GROUP}$/,
/WSGIProcessGroup gnocchi-api$/, /WSGIProcessGroup gnocchi-api$/,
%r{WSGIScriptAlias / /var/www/html/gnocchi/app$}, %r{WSGIScriptAlias / /var/www/html/gnocchi/app$},
%r{^WSGISocketPrefix /var/lock/apache2$}, %r{^WSGISocketPrefix /var/lock$},
%r{ErrorLog /var/log/apache2/gnocchi-api_error.log$}, %r{ErrorLog /var/log/apache2/gnocchi-api_error.log$},
%r{CustomLog /var/log/apache2/gnocchi-api_access.log combined$}, %r{CustomLog /var/log/apache2/gnocchi-api_access.log combined$},
].each do |line| ].each do |line|