79 Commits

Author SHA1 Message Date
ZhiQiang Fan
1af4afb004 Replace DEFAULT section with service_credentials
Some options defined in ceilometer.service should be in service_credentials
section instead of DEFAULT, which is deprecated since Havana.

Change-Id: I69077394a77f379db2be593a9fa15d414015610a
2014-04-16 14:55:26 +08:00
Jenkins
5d4406c56d Merge "Complete moving Keystone setup out of keystone_data.sh" 2014-03-18 05:46:48 +00:00
Jenkins
9f59782a36 Merge "Devstack changes to ceilometer to support vsphere" 2014-03-17 22:01:22 +00:00
Piyush Masrani
846609b627 Devstack changes to ceilometer to support vsphere
Ceilometer currently supports only libvirt when installed
using devstack. Have extended this support to Vmware Vsphere in this changelist.

Change-Id: I98c64204973bca5e6a7f859a5431adb2b661277f
2014-03-14 19:59:00 +05:30
Ian Wienand
936284b02a Make mongo install for ceilometer NOPRIME
mongodb packages are missing on some platforms, so we switch to a
manual install.  Also gate the mongo call in cleanup

Change-Id: I1755e461c66be30da3db2a0994f908503c4c38ea
2014-03-11 10:32:01 +11:00
Dean Troyer
42a59c2bfa Complete moving Keystone setup out of keystone_data.sh
* Move remaining role creation to create_keystone_accounts()
* Move glance creation to create_glance_accounts()
* Move nova/ec2/s3 creation to create_nova_accounts()
* Move ceilometer creation to create_ceilometer_accounts()
* Move tempest creation to create_tempest_accounts()
* Convert moved code to use OpenStackClient for setup
* files/keystone_data.sh is removed

Note that the SERVICE_TENANT and ADMIN_ROLE lookups in the other service
implementations are not necessary with OSC, all operations can be done
using names rather than requiring IDs.

Change-Id: I4283ca0036ae39fd44ed2eed834b69d78e4f8257
2014-03-10 15:17:30 -05:00
Nadya Privalova
423d7901a4 Add an ability to configure debug-level for ceilometer
Change-Id: Ibe9dd2391202a5af291d2eed1559bae60370f9a8
2014-03-06 15:16:42 +04:00
Sean Dague
b9a7035081 fix typo in lib/ceilometer
this should be is_service_enabled and not service_enabled. Not
sure why it passes in the gate, but it fails in stackforge jobs.

Change-Id: I876f72cd98ff9c8e4ea28832bc9ac6bbdc3b865d
2014-03-04 15:02:04 -05:00
Sean Dague
c921a95f63 only do a dbsync if on the database node
ceilometer should only try to reset the database if it's actually
on a node where there is a database.

Change-Id: Ibcfec0556829bff0938e3769c19d34ae6c02b738
2014-02-28 21:09:33 -05:00
Sean Dague
7083b8224d make ceilometer work if you don't enable ceilometer-api
when doing ceilometer in a multihost devstack, you don't want
ceilometer-api running on the computes. Under -o errexit this
became fatal.

Change-Id: Ie43c8724ba467b810f5a3b075dea45d66dde8648
2014-02-28 20:17:19 -05:00
Ian Wienand
aee18c749b Enforce function declaration format in bash8
Check that function calls look like ^function foo {$ in bash8, and fix
all existing failures of that check.  Add a note to HACKING.rst

Change-Id: Ic19eecb39e0b20273d1bcd551a42fe400d54e938
2014-02-28 07:59:03 +11:00
Steve Martinelli
19685428e3 Change most keystoneclient commands to openstacklient in libs
migrated most keystoneclient commands from the following libs:
 ceilometer
 cinder
 ironic
 keystone
 marconi
 neutron
 nova
 savanna
 swift
 trove

Also need to set and unset openstackclient specific environment
variables from stack.sh

Change-Id: I725f30bc08e1df5a4c5770576c19ad1ddaeb843a
2014-02-14 21:30:57 -06:00
Dean Troyer
e4fa721322 Begin is_service_enabled() cleanup
This converts the special cases in the is_service_enabled() function to call
individual functions declared by the projects.  This allows projects that
are not in the DevStack repo and called via the extras.d plugin to handle
an equivalent service alias.

* Ceilometer
* Cinder
* Glance
* Neutron
* Nova
* Swift

TODO: remove the tests from is_service_enabled() after a transition period

Patch Set 2: Rebased

Change-Id: Ic78be433f93a9dd5f46be548bdbd4c984e0da6e7
2014-02-07 10:06:21 -06:00
Jenkins
f5cfa1eccd Merge "Have ceilometer to respect the keystone settings" 2014-02-03 18:51:22 +00:00
Attila Fazekas
8664ca53f8 bash_completion for heat and ceilometer
Installing bash completion for heat and ceilometer by using a
similar way used with other services.

Change-Id: I5094648272f2666f6bff181bfa3aeb35e863bd97
2014-02-02 10:50:54 +01:00
Attila Fazekas
2ed4ae70b8 Have ceilometer to respect the keystone settings
lib/ceilometer ignored the global settings related to keystone settings.

It can cause issues for example when the keystone does not listen on
127.0.0.1 even in single node deployment.

Change-Id: I6e4654daa2ec624ac11aaf7f49495fcfaa72071d
2014-02-02 09:38:05 +01:00
Dean Troyer
4237f590b7 Generate Tempest service list rather than hard-code it
The list of services that Tempest used to set its 'service_available'
config values was hard-coded. To be plugin-friendly have each
service (project) add its name to the TEMPEST_SERVICES variable
and use that for setting the 'service_avilable' values.

Change-Id: I208efd7fd0798b18ac2e6353ee70b773e84a2683
2014-01-29 17:25:45 -06:00
Jenkins
cac3c6b110 Merge "Add missing mongodb client package on Fedora" 2014-01-26 02:44:27 +00:00
ZhiQiang Fan
1b6ba54088 Remove unnecessary slash from ceilometer endpoint
The last slash in ceilometer endpoint is not needed, it should be
removed because it will generate redundant slash which has been
treated as a bug in ceilometer.

Change-Id: Ifcff9b63921f5b1dda667d8e77aab22ca2928a8b
Closes-Bug: #1271556
ref: https://review.openstack.org/#/c/63279/
2014-01-22 22:56:59 +08:00
Ana Krivokapic
39d500335a Add missing mongodb client package on Fedora
On Fedora, when ceilometer is enabled and mongodb is used as backend,
devstack installation would fail due to missing mongodb client package.
This patch ensures the package gets installed.

Change-Id: I981bb55f86541e5ff19c52160269a7789b94423f
2014-01-17 18:34:29 +01:00
Jenkins
434fac566b Merge "Setup Keystone catalog information for Ceilometer" 2014-01-13 17:46:26 +00:00
Dean Troyer
9fc8792b0a Robustify service shutdown
* Save PID when using screen in screen_it()
* Add screen_stop()
* Call out service stop_*() in unstack.sh functions so screen_stop()
  can do its thing

Closes-bug: 1183449
Change-Id: Iac84231cfda960c4197de5b6e8ba6eb19225169a
2014-01-11 11:46:19 -06:00
Dirk Mueller
fa5ccfff10 Setup Keystone catalog information for Ceilometer
Change-Id: I3f536f38fe7862ee41b06d1d48b848cc07492c8d
Closes-Bug: #1267322
2014-01-09 14:05:39 +01:00
Gordon Chung
1c402286cf split collector service
the ceilometer collector service has been split into two:
ceilometer-collector and ceilometer-agent-notification

Change-Id: I6114fd7f3e063abfa74d48d402dc863bccd249b6
Blueprint: split-collector
2013-11-26 13:30:11 -05:00
Jenkins
e2ebd2315e Merge "Make use of STACK_USER instead of relying on USER" 2013-11-22 13:47:12 +00:00
Stephan Renatus
e578effb33 Make use of STACK_USER instead of relying on USER
Quite easily one ends up calling ./stack.sh in an environment that,
albeit being user "stack" (for example), doesn't quite meet the
expectations of devstack.  The errors that follow can be rather hard to
track down, as the dependency on `USER` is not mentioned.

To remedy this situation, this commit

- uses STACK_USER instead of USER and
- mentions that dependency in the script headers of lib/*

Change-Id: If4cdc39b922ea64b4c0893a0e695ec06349fccc5
2013-11-19 13:39:58 +01:00
Mehdi Abaakouk
8ceb794c65 Allow users to configure the CM pipeline interval
The patch allows users to configure the ceilometer pipeline interval.
In localrc, we can add CEILOMETER_PIPELINE_INTERVAL=10 to handle the
pipeline each 10 seconds instead of the default 10 minutes.

Change-Id: Ic5216adbdfd70ade38912871ac6df3be732bf780
2013-11-13 14:46:34 +01:00
Mehdi Abaakouk
fc1b7786eb cm-cpu-agent only support libvirt driver
ceilometer-compute-agent only support libvirt driver

Change-Id: I8b92ef10f52388ead11f8ce51c9ab119f953efae
2013-11-13 09:34:50 +01:00
Jenkins
b7c11a0f98 Merge "Fix some Markdown formatting issues" 2013-10-31 14:19:15 +00:00
Jenkins
8e285072c9 Merge "Fix shocco errors and warnings" 2013-10-31 14:18:32 +00:00
Jenkins
c8aca45ecc Merge "Ensure cm-api is ready before start cm-alarm" 2013-10-31 14:16:48 +00:00
Thomas Maddox
246d9bbd4a Add PostgreSQL option for Ceilometer backend
Adds the PostgreSQL case for a Ceilometer backend and
initializes Ceilometer accordingly.

Closes-Bug: #1244381
Change-Id: Iefc5bb7eea6e9efa1f2ad04f1f8dc714e3404c9c
2013-10-25 13:09:22 +00:00
Adam Spiers
6a5aa7c6a2 Fix some Markdown formatting issues
Address miscellaneous issues with Markdown formatting in comments which
are consumed by shocco when generating the online documentation.

Change-Id: I953075cdbddbf1f119c6c7e35f039e2e54b79078
2013-10-24 17:38:19 +01:00
Mehdi Abaakouk
1ed64cbbf0 Ensure cm-api is ready before start cm-alarm
The patch ensure that ceilometer-api is ready before
starting the ceilometer-alarm-evaluator service.

This ensure that ceilometer-alarm-evaluator doesn't log a error message
on startup due to not yet available ceilometer-api.

Closes bug: #1243249

Change-Id: Icff3e972ec485f26c014071f68079593a14b7240
2013-10-24 17:32:20 +02:00
Adam Spiers
cb961597cc Fix shocco errors and warnings
A few Markdown-oriented issues were causing Docutils errors to
leak into the end-user docs on http://devstack.org

Change-Id: I51fa9698afb1bfb48596478d83bd1fdcd84ac52e
2013-10-24 15:43:05 +01:00
Mehdi Abaakouk
6d4a9a87b7 Don't kill ceilometer prematurally in devstackgate
This change ensure that 'ceilometer' processes are not killed
by stack.sh when USE_SCREEN=False

Fixes bug #1234254

Change-Id: I48dbf18ea0b169cdb5295a709d82c025f6fb8930
2013-10-17 19:20:15 +02:00
Eoghan Glynn
19eed74422 Modified ceilometer alarm evaluator console script
Take account of the modification to the alarm evaluator
console script naming in the following commit:

  https://github.com/openstack/ceilometer/commit/bad5f18e

Change-Id: Ic7fc3b8ad7be9dd2a5b5ed3c07e169691229bb4d
2013-09-23 11:36:00 +01:00
Jenkins
8a67fec119 Merge "Rename ceilometer alarm service name" 2013-09-06 16:32:51 +00:00
Julien Danjou
69f745748d Switch Ceilometer default backend to MySQL
MongoDB 2.4 not being available in Ubuntu cloud archive for a while now,
and the catch up done by this driver allows me to think it might be a
good idea to switch by default on SQL for now on devstack.

We can add another job to have Ceilometer tested on MongoDB too later.

Change-Id: I74c3c436d009fed898c5ae4ffb82763e9a337d90
2013-09-05 13:53:28 +00:00
fujioka yuuichi
b53bce1c26 Rename ceilometer alarm service name
Rename service name "ceilometer-alarm-eval" to
"ceilometer-alarm-singleton" and "ceilometer-alarm-notify" to
ceilometer-alarm-notifier" in this patch.

Change-Id: I6619cc02874f6f59c43ba2952325e9d0533e395d
2013-09-05 19:43:03 +09:00
Jenkins
bc522d87f8 Merge "Launch ceilometer-alarm-* services." 2013-08-01 11:51:45 +00:00
Eoghan Glynn
8d13703437 Launch ceilometer-alarm-* services.
Add ceilometer-alarm-notify and ceilometer-alarm-eval to the set
of ceilometer services launchable by devstack when explicitly
enabled in the localrc.

Change-Id: I1575437c588cf9079f1e3a6c855123eae09c5dac
2013-07-30 18:41:54 +01:00
Jay Lau
73bd1233a7 Do not set os_aut_url for ceilometer
When install ceilometer with devstack, if do not set environment
variable OS_AUTH_URL, then devstack will set os_aut_url as empty
in /etc/ceilometer/ceilometer.conf, this will cause both
ceilometer-agent-central and ceilometer-agent-compute cannot start.

Fix bug 1205776

Change-Id: I32c77c92dc2e9d03c86e703f170e0216dd829a61
2013-07-28 18:02:58 +08:00
Guangyu Suo
9778b3cb68 Add mysql support for ceilometer storage backend in devstack
Currently, devstack only support mongodb as ceilometer storage backend,
this patch is to add mysql storage support for ceilometer.
If you want to use mysql as backend during developing, you can specify
CEILOMETER_BACKEND=mysql in localrc file.
If you use mongodb, just ignore the parameter.

Change-Id: Ic2f475a9baa6d71a43cd29a6ca777ac972e47b0a
Implements: blueprint ceilometer-mysql-support
2013-07-18 11:14:44 +08:00
Gordon Chung
5ecfd48c51 ceilometer switch to setuptools console scripts
ceilometer has dropped bin scripts and switched to console scripts

blueprint setuptools-console-scripts

Change-Id: If6dff10471e351fe3640a60cc45fef719f671997
2013-06-06 00:25:16 -04:00
Gordon Chung
8f3af42f56 ceilometer does not set db in conf file
Set [database]connection option to mongodb rather than sqlite as mongodb
is the only fully supported db.

Change-Id: I2b9fbc65de4476593d456a782dbc7e6540a75141
Fixes: bug #1186240
2013-05-31 09:02:41 -04:00
Jenkins
26f7a5ae4e Merge "fix ceilometer ENABLE_SERVICES comment" 2013-05-15 16:45:48 +00:00
Shengjie Min
eda5579e1c fix ceilometer ENABLE_SERVICES comment
- keep it aligned with the Ceilometer doc

Change-Id: Ib1ca0cfbeafc61723e5d4fe79da6355db7d76f0c
Fixes: bug #1179590
2013-05-14 15:42:22 +01:00
Gordon Chung
701eb61931 ceilometer setup incorrectly sets notification_topics
drop glance_notifications from notification_topics in ceilometer setup

Change-Id: Ib18b4193af9df925b4ce4dbe3faf4c6a756ed03f
Fixes:Bug #1178704
2013-05-10 10:47:50 -04:00
Émilien Macchi
b2ef890db3 Add Debian OS support in DevStack
Fix bug #1176216

Change-Id: Ia94c332f02a921a936db249dc3b4a7ae4eff0400
2013-05-09 00:18:37 +02:00