]> review.fuel-infra Code Review - puppet-modules/puppet-ceilometer.git/log
puppet-modules/puppet-ceilometer.git
10 years agoPin puppetlabs-concat to 1.2.1 in fixtures
Colleen Murphy [Wed, 15 Apr 2015 22:14:14 +0000 (15:14 -0700)]
Pin puppetlabs-concat to 1.2.1 in fixtures

Puppet Labs is in the process of releasing a 2.0.0 version of
puppetlabs-concat, which will have many breaking changes that affect
many dependent modules. Changes have been merged to master, but not yet
released. While we figure out what changes we need to make in our own
modules and wait for updates in dependent modules, we should just pin
to a stable version.

This module declared concat twice in the fixtures, so we also remove
the second one so that pinning is effective.

Conflicts:
.fixtures.yml

Change-Id: I53f6bd56099287bfc075bffb24a9ab4be8133cab
(cherry picked from commit 2b3a328ea6776a74e1335c7d800763420b403916)

10 years agoPin fixtures for stables branches
Sebastien Badia [Mon, 16 Mar 2015 09:31:09 +0000 (10:31 +0100)]
Pin fixtures for stables branches

Use the current branch for others fixtures in order to avoid to break tests due
to master changes.

Change-Id: I4a9041d71a84462af5a36410b32141aa869a4efc

10 years agospec: pin rspec-puppet to 1.0.1
Sebastien Badia [Tue, 3 Feb 2015 14:32:20 +0000 (15:32 +0100)]
spec: pin rspec-puppet to 1.0.1

rspec-puppet (2.0.0) was released yesterday[1], this new version broke
puppet-openstack unit tests (undefined method `resource')[2] as talked on
and in a second time to update your specs to 2.0.0 and rspec 3.x`)

[1] https://github.com/rodjek/rspec-puppet/commit/8459e14807977244c00bdbcf190062c529b63474
[2] http://logs.openstack.org/45/105245/6/check/gate-puppet-nova-puppet-unit-3.3/3682541/console.html

Change-Id: Ia41394433be65435fc7de6327a5659b26e1a85a5
Partial-bug: #1417604
(cherry picked from commit 71f27f1a49d04f13cf950871946b2da8240c54fc)

10 years agoMerge "Switch to TLSv1 as SSLv3 is considered insecure and is disabled by default...
Jenkins [Wed, 28 Jan 2015 09:36:35 +0000 (09:36 +0000)]
Merge "Switch to TLSv1 as SSLv3 is considered insecure and is disabled by default" into stable/juno

10 years agoSwitch to TLSv1 as SSLv3 is considered insecure and is disabled by default
Lukas Bezdicka [Fri, 2 Jan 2015 19:04:10 +0000 (20:04 +0100)]
Switch to TLSv1 as SSLv3 is considered insecure and is disabled by default

Rabbitmq won't talk to us anymore if we try to use SSLv3 as it disabled
support for SSLv3. Openstack components use python's openssl
implementation which does not support TLSv1.1 and TLSv1.2 yet so we
just switch to TLSv1. Support for newer TLS should come with python
2.7.9+

Closes-Bug: #1409667
Change-Id: I00cfa06030b84ae23cb8548b74cf5684562377aa
(cherry picked from commit 90247cf8cd0eac760d5b8eb986ceacf0db3fcc7f)

10 years agoImplement Ceilometer-API as a WSGI process support
Emilien Macchi [Wed, 7 Jan 2015 23:40:33 +0000 (18:40 -0500)]
Implement Ceilometer-API as a WSGI process support

Ceilometer API can be run as a WSGI process.
Let's use openstacklib to run this service under WSGI process by using
Apache2.

Change-Id: I004d7e7a9bfccc4677d5d629503a92a15b6263c6
(cherry picked from commit a3fbf2e8cb9ef76d2ee960cc8087c62736f7de6c)

10 years agocrontab: ensure the script is run with shell
Emilien Macchi [Tue, 9 Dec 2014 15:53:50 +0000 (10:53 -0500)]
crontab: ensure the script is run with shell

Some distros does not provide a default shell for Ceilometer user.
We can run the crontab by force shell usage and avoid running
issues.

Closes-bug: #1400523
Change-Id: I3a4d5c958a4620335d062baecfc362fd758768b6
(cherry picked from commit a83673c3bae7d560680cb77f2a2cc8c998fac2b7)

10 years agoAdd support for configuring coordination/backend_url
Chris Dent [Thu, 13 Nov 2014 20:24:33 +0000 (20:24 +0000)]
Add support for configuring coordination/backend_url

If 'coordination_url' argument and value is provided to the central agent
or alarm evaluator classes, they will try to set 'backend_url' in the
'[coordination]' section of the ceilometer_config. This allows group
membership handling coordinated by tooz.

ensure_resource is used to avoid duplicate resources while still allowing
the central agent and alarm evaluator to be configured separately if
on different machines.

Note that this change does not include support for enabling coordination
of the compute agent.

Change-Id: I707a8b70ad742cc9f8fdc62c196d0e75574a50b2
(cherry picked from commit fade72deab0c52f7ea71b2891acb3785e1682a6b)

10 years agoRelease 5.0.0 - Juno 5.0.0
Colleen Murphy [Fri, 21 Nov 2014 00:59:10 +0000 (16:59 -0800)]
Release 5.0.0 - Juno

Changes in this release:
* Added package_ensure parameters to various classes to control package installation
* Added ceilometer::policy to control policy.json
* Updated validate_re expressions for Puppet 3.7
* Bumped stdlib dependency to >=4.0.0
* Added manage_service parameters to various classes to control whether the service was managed, as well as added enabled parameters where not already present
* Added parameters to control whether to configure users
* Added the ability to override the keystone service name in keystone::auth
* Migrated the ceilometer::db::mysql class to use openstacklib::db::mysql and deprecated the mysql_module parameter
* Fixed ceilometer-notification package name for RHEL
* Removed deprecation notices for sectionless ceilometer_config types for Juno release
* Added ability to hide secrets from puppet logs

Change-Id: Ifda9dba6ef8a9eb99d1a5d2bf45aa74b210675dc

10 years agopolicy.pp : Fix duplicate ressource issue openstacklib::policy
Yanis Guenane [Mon, 10 Nov 2014 19:45:07 +0000 (14:45 -0500)]
policy.pp : Fix duplicate ressource issue openstacklib::policy

Currently, in the policy.pp file the class openstacklib::policy
is called. The same apply for all components resulting in a
Duplicate Ressource issue. Using directly the underlying ressource
openstacklib::policy::base we prevent this issue.

Change-Id: Ia384a42365056317ca14031081f8c6e134f266aa

10 years agoMerge "Added metadata lint and puppet-syntax gems"
Jenkins [Sun, 9 Nov 2014 11:25:25 +0000 (11:25 +0000)]
Merge "Added metadata lint and puppet-syntax gems"

10 years agoMerge "policy.json: Allow one to manage them from the puppet module"
Jenkins [Sun, 9 Nov 2014 11:23:58 +0000 (11:23 +0000)]
Merge "policy.json: Allow one to manage them from the puppet module"

10 years agoAdded metadata lint and puppet-syntax gems
Sebastien Badia [Thu, 9 Oct 2014 14:50:53 +0000 (16:50 +0200)]
Added metadata lint and puppet-syntax gems

metadata-json-lint is a little tool to check the validity of
Puppet metatdata.json files.

puppet-syntax tool check the validity of templates,manifests and hiera
files (the goal here is to replace manual checks in the gate by a
standard? check `rake syntax`).

Change-Id: I60b9cdfe27eeb8a8f5ad3a238dd847ed3096cb6b

10 years agoAdd package_ensure where missing
Xav Paice [Tue, 2 Sep 2014 08:59:29 +0000 (20:59 +1200)]
Add package_ensure where missing

This adds package_ensure parameter to:
* ceilometer::agent::central
* ceilometer::agent::compute
* ceilometer::agent::notification
* ceilometer::api
* ceilometer::collector

Change-Id: I3a982882c37a24737d71f9af93d7aa0d7200bdf4

10 years agopolicy.json: Allow one to manage them from the puppet module
Yanis Guenane [Fri, 26 Sep 2014 23:07:49 +0000 (19:07 -0400)]
policy.json: Allow one to manage them from the puppet module

This commit allow a deployer to manage the policies via this module
It relies on augeas to change only the policy needed. The init takes
a hash of policies and apply them.

Change-Id: I413702d5baa0e96c43f9a599e1e06ed23ab23993

10 years agoSwitch to metadata.json for Puppet forge releases
Sebastien Badia [Sat, 27 Sep 2014 09:14:56 +0000 (11:14 +0200)]
Switch to metadata.json for Puppet forge releases

Since puppet 3.x, Puppet Labs Forge accept only the metadata.json file
for module description (Modulefile is now deprecated).

This patch :
 - convert the Modulefile to metadata.json.
 - bump major version to 5 (for juno), and deps.
 - switch to stackforge namespace.
 - relax pe version_requirement to 3.x.

Change-Id: Iff1f059764547634570b763f04833ddbc01f4758

10 years agoMerge "Stringify $evaluation_interval for validate_re call"
Jenkins [Fri, 3 Oct 2014 20:18:33 +0000 (20:18 +0000)]
Merge "Stringify $evaluation_interval for validate_re call"

10 years agoEnsure nova-common is installed before ceilometer
Chris Hoge [Thu, 2 Oct 2014 01:10:50 +0000 (20:10 -0500)]
Ensure nova-common is installed before ceilometer

Ceilometer depends on the nova user and group being
present. This change adds a dependency to nova-common
to ensure that packging will handle the user before
the ceilometer compute agent tries to add user ceilometer
to the nova group.

Fixes bug 1350980

Change-Id: Iaf950c4a487b4b25c9053d59cab4fa45a1f7390b

10 years agoMerge "Make user creation optional when creating service."
Jenkins [Mon, 29 Sep 2014 19:39:13 +0000 (19:39 +0000)]
Merge "Make user creation optional when creating service."

10 years agoMerge "Add manage_service feature"
Jenkins [Mon, 29 Sep 2014 04:13:53 +0000 (04:13 +0000)]
Merge "Add manage_service feature"

10 years agoStringify $evaluation_interval for validate_re call
Mike Dorman [Thu, 18 Sep 2014 18:18:30 +0000 (12:18 -0600)]
Stringify $evaluation_interval for validate_re call

Under Puppet 3.7.x, calls to validate_re fail if the parameter is not
strictly a string.  This change creates a string from
$evaluation_interval when passing to validate_re, so the call will
pass regardless of if the parameter to the class is specified as
string or an integer.

Change-Id: I17b82977f21483acf134837a66c5ecebe346cfdf
Closes-Bug: 1371235

10 years agoUpdate stdlib dependency to 4.x
Colleen Murphy [Mon, 22 Sep 2014 21:53:47 +0000 (14:53 -0700)]
Update stdlib dependency to 4.x

puppetlabs/stdlib 4.x is backwards compatible with 3.x and still tested
on Puppet 2.7. Updating stdlib to 4.x allows modules to use newer
functions without breaking older functionality.

Change-Id: I710daa21f3c1cf5640903243904655817e2a69f2

10 years agoAdd manage_service feature
Martin Magr [Wed, 20 Aug 2014 13:57:55 +0000 (15:57 +0200)]
Add manage_service feature

puppet-ceilometer lacks of disabling service managing. This patch adds
$manage_service parameter to all relevant classes.

Closes-bug: #1359823
Change-Id: Iee545b46ef5d7cf92859356ae84b8103564bf047

10 years agoMake user creation optional when creating service.
Mike Dorman [Wed, 10 Sep 2014 16:39:04 +0000 (11:39 -0500)]
Make user creation optional when creating service.

In some cases it is useful to be able to just configure
the service in Keystone and not the service user. This
is the case when e.g. a read only LDAP backend is used.
Added a parameter configure_user (defaults to true).
Closes-Bug: 1360232

Change-Id: I541224b9bf431da957b9de31909e0aad5c9be187

10 years agoMakes kombu_ssl_* parameters optional when rabbit_use_ssl => true
Mike Dorman [Thu, 4 Sep 2014 19:49:30 +0000 (13:49 -0600)]
Makes kombu_ssl_* parameters optional when rabbit_use_ssl => true

The kombu_ssl_* parameters should not be required when rabbit_use_ssl => true
Rather, rabbit_use_ssl must be set to true if the kombu_ssl_* parameters are
used.

Change-Id: I7664dda2c66ffb34ceb56ada722574ae0e490f8f
Closes-Bug: 1356083

10 years agoMerge "Adds ability to override service name for service catalog"
Jenkins [Wed, 3 Sep 2014 15:15:10 +0000 (15:15 +0000)]
Merge "Adds ability to override service name for service catalog"

10 years agoMerge "Migrate mysql backend to use openstacklib::db::mysql"
Jenkins [Wed, 3 Sep 2014 03:32:40 +0000 (03:32 +0000)]
Merge "Migrate mysql backend to use openstacklib::db::mysql"

10 years agoAdds ability to override service name for service catalog
Mike Dorman [Wed, 13 Aug 2014 15:19:26 +0000 (09:19 -0600)]
Adds ability to override service name for service catalog

Instead of forcing the name of the service in the service catalog to
match auth_name, this allows the ability to explicitly set the service
name, spearately from auth_name.
If service_name is not specified, it's value defaults to the value
of auth_name (which maintains the current behavior.)

Closes-bug: #1359755
Change-Id: I66dadaebb526cfae2b6c250b2bef97e1e6d6aafe

10 years agoAdd extended logging options.
Johannes Grassler [Tue, 12 Aug 2014 12:17:33 +0000 (14:17 +0200)]
Add extended logging options.

There is a range of extended logging options in Openstack services that use
openstack.common.logger (Ceilometer, Cinder, Heat, Keystone, Nova). Adding
ceilometer::logging to support them.

No blueprint/spec, as discussed in the IRC meeting on 08-11-2014.

Change-Id: I910e2f9e4f3ad1991d58ba6df16adfbc85e20131

10 years agoMigrate mysql backend to use openstacklib::db::mysql
Colleen Murphy [Thu, 31 Jul 2014 18:11:26 +0000 (11:11 -0700)]
Migrate mysql backend to use openstacklib::db::mysql

Implements: blueprint commmon-openstack-database-resource
Change-Id: Iaa4f1cfb6a26795112117e2d3230b4a11250e2df

10 years agoFix ceilometer agent notification package error
Xingchao Yu [Thu, 7 Aug 2014 07:05:23 +0000 (15:05 +0800)]
Fix ceilometer agent notification package error

ceilometer-notification package name should be
openstack-ceilometer-notification in RHEL.
See more info in related bug tracker record.

Change-Id: If64f1ea641c5d99c0adf2104a308c2d5442c3324
Closes-Bug: #1353844

10 years agoAdd ability to disable ceilometer-collector without db
Mathieu Gagné [Tue, 5 Aug 2014 15:58:27 +0000 (11:58 -0400)]
Add ability to disable ceilometer-collector without db

You are no longer required to include ceilometer::db when
disabling ceilometer-collector using the enabled parameter.

The relationships with any database resources are now only enforced
when the service is enabled.

Closes-bug: #1352958
Change-Id: I00a5e651184788acdd30de1908e2bf38566f78e1

10 years agoMerge "Use 2.2 as the default mysql_module"
Jenkins [Tue, 29 Jul 2014 23:01:01 +0000 (23:01 +0000)]
Merge "Use 2.2 as the default mysql_module"

10 years agoUse 2.2 as the default mysql_module
Soren Hansen [Wed, 16 Jul 2014 13:13:48 +0000 (18:43 +0530)]
Use 2.2 as the default mysql_module

Change-Id: I91c87fa0b4d5871aa936a5b4842b47f4cfee4ca8

10 years agoRemove deprecation notice for sectionless ceilometer_config
Sebastien Badia [Sat, 12 Jul 2014 00:20:30 +0000 (02:20 +0200)]
Remove deprecation notice for sectionless ceilometer_config

ceilometer_config used to accept section-less configuration name.

Change-Id: I11348ced3bccb1bb88ae493ae1e15017aa360096

10 years agoFixes Facts string comparisons in CentOS 7
Gael Chamoulaud [Wed, 9 Jul 2014 09:52:25 +0000 (11:52 +0200)]
Fixes Facts string comparisons in CentOS 7

- CentOS Project has adopted a new rule for versioning numbers. The major number
  matches the RHEL major number, but the minor number is generated from the
  release date. For example, CentOS 7.0.1407.
- Adds Support for Scientific Linux.

Change-Id: I3220206aa01b9f5c838e524b3fec723c92435153
Closes-Bug: 1338777
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
10 years agoMake Modulefile summary and description consistent
Mathieu Gagné [Wed, 2 Jul 2014 17:51:13 +0000 (13:51 -0400)]
Make Modulefile summary and description consistent

Improve consistency of Modulefile across puppet modules for OpenStack.

Change-Id: Ia6e7918ce783c603720f8da97b54cb40edd25a59

11 years agoNormalize Gemfile & pin tests to rspec < 2.99
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.

Change-Id: Ia1286824cebca09e20bf6d11a3435982b93442b9
Partial-Bug: #1326034

11 years agoHide secrets from puppet logs
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.

Change-Id: I9eb6504220c5337c154bf5ad86c7d22bea64df51
Closes-Bug: #1328448

11 years agoMerge "Fixes agent_notification_service_name"
Jenkins [Thu, 5 Jun 2014 15:42:45 +0000 (15:42 +0000)]
Merge "Fixes agent_notification_service_name"

11 years agoFixes agent_notification_service_name
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'.

Change-Id: Ie2703a028ce154efa7fa1d0da58914230adfc7db

11 years agoDefault to utf8 for MySQL
Chris Ricker [Fri, 23 May 2014 19:14:48 +0000 (15:14 -0400)]
Default to utf8 for MySQL

Change default charset to utf8 and default collation order to
utf8_unicode_ci to align with upstream defaults.

Change-Id: I0fb57f14a0d30226c840a6e920f2b3807b90080a
Closes-Bug: #1322715

11 years agoFail when ssl parameters are missing and rabbit_use_ssl is set to true
Yanis Guenane [Fri, 16 May 2014 15:48:51 +0000 (11:48 -0400)]
Fail when ssl parameters are missing and rabbit_use_ssl is set to true

This commit causes the run to fail is rabbit_use_ssl parameter is set
to true but the ssl related parameters remains undef.

Change-Id: Idd40601fe4a632204fdde120b857d0e22b6a2aed

11 years agoImplement rspec function it_raises
Yanis Guenane [Thu, 15 May 2014 18:40:46 +0000 (14:40 -0400)]
Implement rspec function it_raises

On some puppet modules, a it_raises helper is provided. This commit
implements it for puppet-ceilometer.

Change-Id: Ie1c83e09952fed1f114fc07d9944f89e94c413f1

11 years agonotification agent: fix dependency cycle
Emilien Macchi [Wed, 7 May 2014 20:50:52 +0000 (22:50 +0200)]
notification agent: fix dependency cycle

Fix the loop on ceilometer-agent-notification package.

Change-Id: I8e8663fd51f58d419896aa531d49f8e5fc57cdcd

11 years agoMerge "Add RabbitMQ SSL support" 4.0.0
Jenkins [Tue, 6 May 2014 12:59:27 +0000 (12:59 +0000)]
Merge "Add RabbitMQ SSL support"

11 years agoensure_packages needs array in agent::notification
Benedikt Trefzer [Tue, 6 May 2014 11:36:10 +0000 (13:36 +0200)]
ensure_packages needs array in agent::notification

Change-Id: I7029a2e60228bc5014c9008d794493452c822826

11 years agoAdd RabbitMQ SSL support
John Eckersberg [Mon, 5 May 2014 20:20:49 +0000 (16:20 -0400)]
Add RabbitMQ SSL support

Change-Id: I6efe4819fb703ea815de259cb91b2ee50f51a0e3

11 years ago4.0.0 - 2014.1.0 - Icehouse Release
Chris Hoge [Thu, 1 May 2014 17:00:42 +0000 (10:00 -0700)]
4.0.0 - 2014.1.0 - Icehouse Release

Updated Modulefile and README.md for 4.0.0 release.

Change-Id: Ic5d5681c29d4e5c49033d466d5b277ff743303fa

11 years agoMerge "Introduce ceilometer:config to manage custom options"
Jenkins [Tue, 29 Apr 2014 13:22:42 +0000 (13:22 +0000)]
Merge "Introduce ceilometer:config to manage custom options"

11 years agoIntroduce ceilometer:config to manage custom options
Xingchao Yu [Thu, 3 Apr 2014 11:24:03 +0000 (19:24 +0800)]
Introduce ceilometer:config to manage custom options

This ceilometer::config is aim to use ceilometer_config resource
to manage custom configurations in ceilometer.conf.

This will make end user easy to add their own custom options
in Hiera data.

Fully implements blueprint ceilometer-custom-config

Change-Id: I82b38ca26d4d99471a74b2c116e4c4133262187c

11 years agoAdd table to mysql_grant call
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.

Change-Id: I0619446907c5fb51dcdb6e5717faeb61442c699b
Closes-Bug: #1308884

11 years agoRemove duplicate instance_usage_audit
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.

Change-Id: I7f27a731b68359b22785e3807beaf94a39f185bf
Closes-Bug: #1304017

11 years agoMerge "Updated to match semver and release notes."
Jenkins [Fri, 28 Mar 2014 21:45:37 +0000 (21:45 +0000)]
Merge "Updated to match semver and release notes."

11 years agoUpdated to match semver and release notes.
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.

Change-Id: I9ecce6a74fa139d339d8c5d9c7392c3d8c3344ec

11 years agoFixed gate by Updating Gemfile to pin Rake to 10.1.1
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.

Change-Id: I857f6638a54160a315d5d98c77357a7f6449f3bd

11 years agoMerge "Add support for puppetlabs-mysql 2.2"
Jenkins [Fri, 21 Mar 2014 15:23:31 +0000 (15:23 +0000)]
Merge "Add support for puppetlabs-mysql 2.2"

11 years agoMerge "Fix ensure_packages error"
Jenkins [Tue, 18 Mar 2014 08:55:54 +0000 (08:55 +0000)]
Merge "Fix ensure_packages error"

11 years agoMerge "Changes file_path to self.file_path"
Jenkins [Mon, 17 Mar 2014 12:00:50 +0000 (12:00 +0000)]
Merge "Changes file_path to self.file_path"

11 years agoAdd support for puppetlabs-mysql 2.2
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.

Change-Id: I3f76cc600ef8d6e0c88c988f96aadbf18d81f7f1

11 years agoFix ensure_packages error
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.

Change-Id: I96cedf7561af29d92924746881c52bdd1502365f
Closes-Bug: #1292775

11 years agoFix region name configuration
Mathieu Gagné [Tue, 11 Mar 2014 19:58:37 +0000 (15:58 -0400)]
Fix region name configuration

The configuration name is os_region_name, not os_auth_region.

Change-Id: I0849c18c35b39335edda0cbc64c7fb4c5b145d44
Closes-bug: #1291030

11 years agoMerge "Implement notification agent service"
Jenkins [Wed, 5 Mar 2014 23:53:39 +0000 (23:53 +0000)]
Merge "Implement notification agent service"

11 years agoMerge "Move service polling credentials to service_credentials"
Jenkins [Wed, 5 Mar 2014 21:42:07 +0000 (21:42 +0000)]
Merge "Move service polling credentials to service_credentials"

11 years agoMove service polling credentials to service_credentials
Mathieu Gagné [Tue, 4 Mar 2014 21:57:42 +0000 (16:57 -0500)]
Move service polling credentials to service_credentials

Change-Id: I74a523bcc1acd18532bb9353b70da63c70e8e325
Closes-bug: #1287939

11 years agoImplement notification agent service
Emilien Macchi [Fri, 24 Jan 2014 14:25:06 +0000 (15:25 +0100)]
Implement notification agent service

In Icehouse, ceilometer-agent-notification is a new service which splits
ceilometer-collector responsibilites.

implement blueprint ceilometer-agent-notification
Change-Id: Iccc660814991e30b12a884a6e6ffd4f581c768c4
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
11 years agoAdd ability to override notification_topics
Mathieu Gagné [Tue, 28 Jan 2014 23:28:26 +0000 (18:28 -0500)]
Add ability to override notification_topics

The notification_topics value was hard-coded to 'notifications'.

This adds the ability to configure its value.

Change-Id: Ifa831dcc558d41f0de967e5c787ba349a06469d0
Closes-bug: #1273883

11 years agoMerge "Do not enforce glance_control_exchange"
Jenkins [Sun, 23 Feb 2014 04:37:07 +0000 (04:37 +0000)]
Merge "Do not enforce glance_control_exchange"

11 years agoDefine $user referenced in db.pp
Yanis Guenane [Thu, 20 Feb 2014 14:55:13 +0000 (09:55 -0500)]
Define $user referenced in db.pp

In db.pp, in the exec 'ceilometer dbsync' ressource the user
is supposed to be $::ceilometer::params::user, but it was
not defined.

Change-Id: I812b6ba2877faddfce86d3c97b95772b0d22d368

11 years agoAllow db fields configuration without doing the dbsync
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.

Change-Id: I8618bb385147176512fbda1540ba75ac95fccbf1

11 years agoAllow log_dir to be set to false in order to disable file logging
David Moreau Simard [Fri, 14 Feb 2014 16:42:16 +0000 (11:42 -0500)]
Allow log_dir to be set to false in order to disable file logging

This backward compatible commit allows a user to disable logging to
a directory for example if using syslog logging.

Change-Id: I8b496c311b9f26cab64c38d1cfd545784dfc7cab
Related-bug: #1269482

11 years agoChanges file_path to self.file_path
Stefano Zilli [Fri, 14 Feb 2014 15:19:41 +0000 (16:19 +0100)]
Changes file_path to self.file_path

Changes file_path to self.file_path in ceilometer_config provider
in order to allow purging as specified in ini_file puppet module
readme.

Change-Id: I41f7c83e3a63b9af9e683933aa09bd45d5b18deb
Closes-Bug: 1280329

11 years agoMerge "Remove glance_notifications from notification_topic"
Jenkins [Fri, 14 Feb 2014 02:36:41 +0000 (02:36 +0000)]
Merge "Remove glance_notifications from notification_topic"

11 years agoMerge "Move metering_secret to publisher section"
Jenkins [Wed, 5 Feb 2014 12:47:51 +0000 (12:47 +0000)]
Merge "Move metering_secret to publisher section"

11 years agoDon't match commented [DEFAULT]
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

Change-Id: I6d13f780f63af8798d94b49246576d1e144a4540

11 years agoDo not enforce glance_control_exchange
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.

Change-Id: I217515c91f092fb3e8039dde2d14a7ab4cbb7245
Closes-bug: #1273878

11 years agoRemove glance_notifications from notification_topic
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.

Change-Id: I3d797c7e849319a1e20ef3ecbf158e8b8579d450
Closes-bug: #1273876

11 years agoMove metering_secret to publisher section
Emilien Macchi [Fri, 24 Jan 2014 13:19:42 +0000 (14:19 +0100)]
Move metering_secret to publisher section

In Icehouse, metering_secret has been moved to [publisher]:
http://git.io/11NwNw

Change-Id: I96c70781902e927c0295af78c93b400d7b4684bb
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
11 years agoRemove log_dir from params and make logs configurable in init
David Moreau Simard [Tue, 21 Jan 2014 18:30:02 +0000 (13:30 -0500)]
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.

Change-Id: I1f970d5e3cc947308221fb2b2cdfb34f89c64314
Partial-Bug: #1269482

11 years agoMerge "Fix package ceilometer-alarm type error on Debian"
Jenkins [Tue, 14 Jan 2014 16:57:55 +0000 (16:57 +0000)]
Merge "Fix package ceilometer-alarm type error on Debian"

11 years agoMerge "Only add ceilometer user to nova group if using compute agent"
Jenkins [Tue, 14 Jan 2014 08:01:03 +0000 (08:01 +0000)]
Merge "Only add ceilometer user to nova group if using compute agent"

11 years agoFixed mysql dependency to match other modules
Chris Hoge [Thu, 9 Jan 2014 00:20:19 +0000 (16:20 -0800)]
Fixed mysql dependency to match other modules

Fixed the mysql dependency to match the other puppet-openstack modules.

Change-Id: I8ad1011f892e2cadfbfa3fa4ca932fae9ded5cf0

11 years agoOnly add ceilometer user to nova group if using compute agent
David Moreau Simard [Tue, 7 Jan 2014 21:41:14 +0000 (16:41 -0500)]
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.

Change-Id: I6cc68152325a967c024ce611f92a90ce0afba8cc

11 years agoFix package ceilometer-alarm type error on Debian
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)

Closes-bug: #1263946

Change-Id: I1ad19af429f2787d58837e51da95e981bdd66b40

11 years agoAdd API binding options
Emilien Macchi [Thu, 2 Jan 2014 14:50:34 +0000 (15:50 +0100)]
Add API binding options

Ceilometer is able to bind API server to both an IP address and a port.
This patch aims to add support for both configuration flags.

Change-Id: I83164a925cf115d091cb04d14922ee7bbdd0ac63
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
11 years agoMerge "Add Gemfile.lock to gitignore"
Jenkins [Sun, 29 Dec 2013 07:06:04 +0000 (07:06 +0000)]
Merge "Add Gemfile.lock to gitignore"

11 years agoAdd Gemfile.lock to gitignore
Sebastien Badia [Mon, 23 Dec 2013 18:00:48 +0000 (19:00 +0100)]
Add Gemfile.lock to gitignore

Change-Id: I397c8e72ae656c03f472137041e8ab950f529dfc

11 years agoRemove use of deprecated include_class matcher
Mathieu Gagné [Mon, 23 Dec 2013 07:27:17 +0000 (02:27 -0500)]
Remove use of deprecated include_class matcher

include_class is deprecated since rspec-puppet 1.0.0.
contain_class should be used instead.

Closes-bug: #1263617
Change-Id: If2e5a2c467a5d1c4eb130dc6b2643d05c748abe0

11 years agoTTL mechanism support with expirer service
Emilien Macchi [Wed, 4 Dec 2013 00:04:42 +0000 (01:04 +0100)]
TTL mechanism support with expirer service

Aims to support a TTL mechanism for data entering Ceilometer
collector database.
TTL is very useful to configure when getting a lot of meters.

implement blueprint ttl-support
Change-Id: I9d98e8b833ad94fd79722dee7226e7f4f03aaa2e
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
11 years agoUpdates to params.pp for mongo and postgres packages
Francesco Vollero [Thu, 31 Oct 2013 18:11:58 +0000 (19:11 +0100)]
Updates to params.pp for mongo and postgres packages

*) Removed the hardcoded postgres package from db.pp
*) Changed the mongo package to python-pymongo for RHEL

Change-Id: Ib975f9ce03ee8ffa423e75b62b595bcdefdd1eed
Signed-off-by: Francesco Vollero <fvollero@redhat.com>
11 years agoMerge "changed rabbit_virtualhost(wrong) to rabbit_virtual_host"
Jenkins [Wed, 13 Nov 2013 10:49:16 +0000 (10:49 +0000)]
Merge "changed rabbit_virtualhost(wrong) to rabbit_virtual_host"

11 years agoMerge "Alarm: record history support"
Jenkins [Wed, 13 Nov 2013 10:35:42 +0000 (10:35 +0000)]
Merge "Alarm: record history support"

11 years agofix postgresql connection string
Benedikt Trefzer [Wed, 6 Nov 2013 09:32:59 +0000 (10:32 +0100)]
fix postgresql connection string

Change-Id: I55fab1b9256df92cd521141a9d04a2aa2feb08c9

11 years agochanged rabbit_virtualhost(wrong) to rabbit_virtual_host
Benedikt von St. Vieth [Wed, 6 Nov 2013 08:26:41 +0000 (09:26 +0100)]
changed rabbit_virtualhost(wrong) to rabbit_virtual_host

the puppet module configures a rabbit_virtualhost, there is a missing underscore (rabbit_virtual_host). changed this for manifest and tests.

Change-Id: I02b34eb6531cfa0071a7e52f5a97f0e952f8ea85

11 years agoAlarm: record history support
Emilien Macchi [Fri, 1 Nov 2013 23:50:54 +0000 (00:50 +0100)]
Alarm: record history support

Ceilometer Alarm is able to record alarm change events.
This patch add this support in manifest.

Change-Id: Id8ece03dfd3491cd2886a345771df9622d702190
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
11 years agoUpdated site.pp and added alarm manifests
Francesco Vollero [Tue, 29 Oct 2013 17:07:31 +0000 (18:07 +0100)]
Updated site.pp and added alarm manifests

Change-Id: Ic9e8f977984bda02f60028b2ae18605df52a9205

11 years agoAdded alarm-notifier and alarm-evaluator services
Francesco Vollero [Wed, 9 Oct 2013 17:54:24 +0000 (19:54 +0200)]
Added alarm-notifier and alarm-evaluator services

This patch add the two services to the current puppet module to
be in line with the havana release.

Change-Id: Idfd422078d73aaee6da28cef35d825dd24e8afb8

11 years agoAllow to set full url for endpoints
François Charlier [Thu, 19 Sep 2013 15:33:58 +0000 (17:33 +0200)]
Allow to set full url for endpoints

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.

Fixes Bug#1227742

Change-Id: I834be8ab0f160b24348d218197711e8ecc392f5b

11 years agoAdd ceilometer::agent::auth.
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.

Fixes Bug #1220810.

Change-Id: I167c6c570bdebb4be2ef99cd0b9cf81f37856d9f

11 years agoUse connection to replace deprecated database_connection
Xingchao Yu [Mon, 9 Sep 2013 10:49:38 +0000 (18:49 +0800)]
Use connection to replace deprecated database_connection

This patch is aim to use new param connection in [database]
section to replace the deprecated option database_connection
in [DEFAULT].

Fixes bug #1222744

Change-Id: I82082b791a4c16eb50092b3a96fb8ae439af4e5b