From e1a21a50b70642ca2c3c5e59ff37b1cf8de655de Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Thu, 8 Jul 2021 08:20:44 -0500 Subject: [PATCH] Moving IRC network reference to OFTC Also pull bind cookbook from git to fix version pinning issues and fix ChefSpec. Change-Id: I4e8122210bfaadd028b80d1a6cbd36dab3e3a83d Signed-off-by: Lance Albertson --- Berksfile | 4 ++++ CONTRIBUTING.md | 2 +- metadata.rb | 2 +- spec/aodh_spec.rb | 4 ++-- spec/gnocchi_configure_spec.rb | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Berksfile b/Berksfile index 6b0ac9f..d37c7ef 100644 --- a/Berksfile +++ b/Berksfile @@ -22,4 +22,8 @@ solver :ruby, :required 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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ccba39f..bb03231 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,6 +31,6 @@ Contacts -------- 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 Twitter: @chefopenstack diff --git a/metadata.rb b/metadata.rb index f969f0a..142de61 100644 --- a/metadata.rb +++ b/metadata.rb @@ -3,7 +3,7 @@ maintainer 'openstack-chef' maintainer_email 'openstack-discuss@lists.openstack.org' license 'Apache-2.0' description 'The OpenStack Metering service Ceilometer.' -version '19.1.0' +version '19.1.1' %w(ubuntu redhat centos).each do |os| supports os diff --git a/spec/aodh_spec.rb b/spec/aodh_spec.rb index 74a96e1..2ac35ba 100644 --- a/spec/aodh_spec.rb +++ b/spec/aodh_spec.rb @@ -151,7 +151,7 @@ describe 'openstack-telemetry::aodh' do key_file: '/etc/ceilometer/ssl/private/sslkey.pem', log_dir: '/var/log/apache2', protocol: 'All -SSLv2 -SSLv3', - run_dir: '/var/lock/apache2', + run_dir: '/var/lock', server_entry: '/var/www/html/aodh/app', server_host: '127.0.0.1', 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}$/, /WSGIProcessGroup aodh-api$/, %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{CustomLog /var/log/apache2/aodh-api_access.log combined$}, ].each do |line| diff --git a/spec/gnocchi_configure_spec.rb b/spec/gnocchi_configure_spec.rb index 9448b36..ebd0a5e 100644 --- a/spec/gnocchi_configure_spec.rb +++ b/spec/gnocchi_configure_spec.rb @@ -183,7 +183,7 @@ describe 'openstack-telemetry::gnocchi_configure' do log_debug: nil, log_dir: '/var/log/apache2', protocol: 'All -SSLv2 -SSLv3', - run_dir: '/var/lock/apache2', + run_dir: '/var/lock', server_entry: '/var/www/html/gnocchi/app', server_host: '127.0.0.1', 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}$/, /WSGIProcessGroup gnocchi-api$/, %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{CustomLog /var/log/apache2/gnocchi-api_access.log combined$}, ].each do |line|