Clayton O'Neill [Fri, 20 Jun 2014 11:51:19 +0000 (07:51 -0400)]
Normalize Gemfile & pin tests to rspec < 2.99
Pin to rspec < 2.99 until rspec-puppet officially supports rspec 3.x.
This is to avoid warnings due to deprecated matchers in the
rspec-puppet gem.
This change is also intended to normalize the Gemfile for all stackforge
puppet modules. This should facilitate pinning gem versions when
releasing new stable branches, since the same diff can be used for all
repos.
Stefano Zilli [Tue, 10 Jun 2014 09:17:39 +0000 (11:17 +0200)]
Hide secrets from puppet logs
Currently secrets like rabbit_password or os_password are displayed in
puppet logs when changed. This commit changes ceilometer_config type
adding a new parameter that triggers obfuscation of the values in
puppet logs.
Ivan Chavero [Mon, 26 May 2014 12:54:45 +0000 (06:54 -0600)]
Fixes agent_notification_service_name
This patch corrects the service name of the ceilometer notification
agent, which was 'ceilometer-agent-notification' in pre-release RPMs but
was later changed to 'ceilometer-notification'.
Mark T. Voelker [Thu, 17 Apr 2014 07:16:00 +0000 (03:16 -0400)]
Add table to mysql_grant call
When using puppetlabs-mysql 2.2 with the ceilometer module, an
error occurs due to a call to mysql_grant not specifying a table.
This patch corrects the error by rectifying the mysql_grant call.
Chris Ricker [Mon, 7 Apr 2014 20:44:45 +0000 (13:44 -0700)]
Remove duplicate instance_usage_audit
nova.conf parameters for ceilometer notifications are defined in both
puppet-ceilometer and puppet-nova due to change I9e10dfb2. Remove the
redundant definition from puppet-ceilometer.
Chris Hoge [Fri, 21 Mar 2014 22:45:41 +0000 (15:45 -0700)]
Updated to match semver and release notes.
Before this update the Modulefile was not following semver in
relation to stable/havana, and the README files were not in sync.
This update introduces proper semver and consistency.
Chris Hoge [Mon, 24 Mar 2014 22:28:37 +0000 (15:28 -0700)]
Fixed gate by Updating Gemfile to pin Rake to 10.1.1
The latest Rake update requires Ruby >= 1.9. Bundler in the
current gate uses 1.8.x. This update fixes the gate by pinning
Rake to the last known working version.
Michael Chapman [Fri, 28 Feb 2014 09:08:29 +0000 (20:08 +1100)]
Add support for puppetlabs-mysql 2.2
This patch adds support for the new version of
puppetlabs-mysql via a parameter that will change
which types and classes to depend on from the
mysql module. No spec tests are included since any
tests relying on the new module will fail until
the fixtures are updated.
Mark T. Voelker [Sat, 15 Mar 2014 05:15:02 +0000 (01:15 -0400)]
Fix ensure_packages error
The ceilometer::collector class calls ensure_packages()
on a single package name, but the package name is provided
as a string rather than a one-element array. This causes an
error of the form:
Error: ensure_packages(): Requires array given (String) at
/usr/share/puppet/modules/ceilometer/manifests/collector.pp:16
This patch corrects the error by passing an array instead
of a string.
Yanis Guenane [Wed, 19 Feb 2014 18:50:34 +0000 (13:50 -0500)]
Allow db fields configuration without doing the dbsync
This commit allows one to configure the db fields without running the actual
dbsync command. It remains compliant with the current implementation, leaving
exec {'ceilometer-dbsync': in the catalog. One, now, can decide if it wants
the dbsync to take place or not.
This is useful when one picks mongodb as a backend and wants to use replicaset
This way it can scale horizontally and painlessly using the initSync feature
of mongodb. With this pattern one can add new member of the replica set
easily.
Martin Magr [Mon, 3 Feb 2014 13:31:26 +0000 (14:31 +0100)]
Don't match commented [DEFAULT]
Class ceilometer::agent::compute fails when there are [DEFAULT] sections
commented. This patch is fixing this issue. For more info check
https://bugzilla.redhat.com/show_bug.cgi?id=1060712
Mathieu Gagné [Tue, 28 Jan 2014 23:18:00 +0000 (18:18 -0500)]
Do not enforce glance_control_exchange
The default glance_control_exchange in Ceilometer has been changed
from 'glance_notifications' to 'glance' in grizzly-2. Glance always
had 'glance' for its control_exchange.
This was a bug in Ceilometer and puppet-ceilometer patched it.
It shouldn't anymore.
Mathieu Gagné [Tue, 28 Jan 2014 23:13:01 +0000 (18:13 -0500)]
Remove glance_notifications from notification_topic
The default notification_topic in Glance has been changed from
'glance_notifications' to 'notifications' in grizzly-2.
Ceilometer was configured to also listen on the
'glance_notifications' notification_topic in addition to
'notifications' to patch this bug. It shouldn't anymore.
Remove log_dir from params and make logs configurable in init
log_dir does not seem to be used in other classes. In the use case where
it can be necessary to specify the location of ceilometer logs, this
patch makes it possible to do so while maintaining the default for
backwards compatibility. This patch also adds the possibility of
sending logs to syslog/rsyslog in the same way as implemented in
puppet-nova.
Only add ceilometer user to nova group if using compute agent
When using ceilometer outside of the compute context (ex: with the
swift middleware), puppet-ceilometer attempts to add the user to
the nova group which does not (and probably should not) exist on
the swift nodes.
Sebastien Badia [Sat, 4 Jan 2014 10:32:35 +0000 (11:32 +0100)]
Fix package ceilometer-alarm type error on Debian
This commit:
- Fix type error about ceilometer-alarm package name
- See bug #1263946
- Fix indentation on Debian params.pp
- Fix spec warnings (partition_rpc_topic,record_history)
This changeset allows to set full url for endpoints. The default is
still to use the {public,admin,internal}_{protocol,host} and port
variables. The {public,admin,internal}_url parameters override the
_protocol, _host & port parameters.
There were previously one parameter for each {public,admin,internal}
endpoint url component (protocol, host), but not port.
Adding more parameters to allow different port would add too much
parameters and still missing the path part.
Dan Prince [Wed, 4 Sep 2013 17:00:36 +0000 (13:00 -0400)]
Add ceilometer::agent::auth.
Adds a new agent::auth manifest to hold common auth
parameters used by the Ceilometer compute and central agents.
This fixes a deployment issue where you would get duplicate
auth parameter errors when trying to configure the compute
and central agent on the same machine.
Dan Prince [Thu, 29 Aug 2013 16:56:10 +0000 (12:56 -0400)]
Inline a custom file_line provider to fix agent.
Fixes an issue in the ceilometer::agent::compute manifest
where nova.conf config values for the notification_driver
would get added to the wrong section (always to the end of
the file).
As part of the fix a custom file_line 'after' provider which
supports a new after option has been added.
This allows us to have some control over which section *new*
file lines go into. If there are any pre-existing matching
lines in the file the assumption is that they are already in
the correct section and can be edited in place.
NOTE: I've submitted a pull request to the upstream stdlib repo here
to add the new 'after' option:
Xingchao Yu [Sun, 4 Aug 2013 09:09:06 +0000 (17:09 +0800)]
Update mysql allowed_hosts conditional statement
In the origin ceilometer::db::mysql, if the value of $allowed_hosts
contains or equals to $host, then puppet will complain duplicate
declaration error. This patch is aim to update the allowed_hosts
conditonal statement in ceilometer::db::mysql.
There are two cases to pass $allowed_hosts to $real_allowed_hosts:
- If $allowed_hosts is array,then remove $host from $allowed_hosts;
- elsif $allowed_hosts is string and not equivalent to $host;
At last, if $real_allowed_hosts is not undef, then run
ceilometer::db::mysql::host_access
The source :rubygems is deprecated because HTTP requests are insecure.
Please change your source to 'https://rubygems.org' if possible,
or 'http://rubygems.org' if not.
The 'nova.openstack.common.notifier.rabbit_notifier' is deprecated since
the G release of Openstack, it has to be replaced with
'nova.openstack.common.notifier.rpc_notifier'.