59 Commits

Author SHA1 Message Date
Jenkins
09e92e68d0 Merge "devstack: allow ceilometer-api and keystone to run on different hosts" 2016-07-06 04:20:34 +00:00
Julien Danjou
c8538776d4 devstack: prefix _drop_database
This avoids any possible conflict with another function named the same.

Change-Id: Ib3ad175d1150e54676f0f0ea7381ec96cf5e8ab4
2016-06-30 15:48:55 +02:00
ZhiQiang Fan
cd2e0418c7 devstack: disable workload_partition for compute polling
I7adef87b03129f4f8b38109bf547c7403cc6adad introduces a very good
feature to partition workload for central polling agent, but it
seems not so much value for compute polling agent, which is
natrually workload distributed. There are efforts to reduce the
load of nova-api by adding instance cache in compute polling
agent side, if we increase the compute polling process in the
same node, pollsters may be a bit quicker than before, but things
will get worse for nova-api. And if we want to accelerate the
pollsters, we can search for a better solution instead of increasing
state shared workers.

For most case, I cannot see there is a need to partition workload
on a single node, especially when we running a devstack.

This patch removes the workload_partition setting in devstack
installation for compute polling agent even when there is a
coordinate backend configured. If an user does want this, he can
edit the /etc/ceilometer/ceilometer.conf and restart the compute
polling agent in screen -x, as the usual way.

Change-Id: If4dbcf1d02f5f8bdc189b272fb350a800e23d760
2016-06-30 07:08:15 +00:00
Julien Danjou
913880bafb devstack: do not wait for service to start
There's no reason to wait for ceilometer-api to start, as everything
should be resilient anyway.

(and currently that breaks the gate)

Change-Id: I3c381a43bb7ddc5f873d60bb13e27bc029ccca10
2016-06-28 16:16:30 +02:00
Julien Danjou
f3817aa027 devstack: remove useless policy_file setting
Change-Id: I55643425e3d6070dee0e947bc234bfc6326d1c82
2016-05-02 22:43:19 +02:00
ZhiQiang Fan
54887ff59e [Trivial] Remove CEILOMETER_API_LOG_DIR option for devstack
This option is used for ceilometer-api when
CEILOMETER_USE_MOD_WSGI=False, and create a dedicate directory for
ceilometer-api log.

However, there is no such need, because for such case, ceilometer-api
is just a normal process like ceilometer-polling. We should let
oslo.log decide where to store the log, image that user configures
a path and we override in installation process, then he needs to hack
into screenrc to adjust the path, it is not friendly.

Here I propose to put the api log files in same directory as
ceilometer-polling, by default, it will be /opt/stack/logs.

Change-Id: Icca16dbef53929686950a72b40b2544f45f4afdd
2016-04-28 01:43:53 +08:00
ZhiQiang Fan
0958f16a14 document how to enable ceilometer stable branch in devstack
Change-Id: I7d70f9798e1715bd42570a67e067ef5ec8c81ba1
Closes-Bug: #1510617
2016-04-19 06:30:25 +08:00
Drew Thorstensen
4c491b52e2 Disable ceilometer-aipmi by default for devstack
Due to change https://review.openstack.org/#/c/295011/ the
ceiloemter-polling --polling-namespaces ipmi polling agent no
longer works by default.  This change set updates Ceilometer's
devstack plugin to disable that for standard stacks.

Change-Id: If445953e7ce2090632fe428c0ddd03f9cc6dedc6
Closes-Bug: 1564176
2016-03-31 22:22:04 +00:00
Jenkins
7ed2468814 Merge "'ceilometer-polling' should fail with no valid pollsters" 2016-03-29 12:12:50 +00:00
jizilian
bb6032fd1b 'ceilometer-polling' should fail with no valid pollsters
The command 'ceilometer-polling --pollster-list' should fail with
invalid pollsters.

When executing the command 'ceilometer-polling --pollster-list' with
a wrong pollster like aaa, it still executes and no error will
be shown. It occupies the system resources and shows no errors.

Remove the test case for
"ceilometer-polling --polling-namespaces ipmi" in the upgrade.sh.
In the test environment, the ipmi is not ready. It should fail.

Change-Id: If1f9f9fdbba1832e66d89d6b61f749790df5c2b6
Closes-Bug: #1553926
2016-03-29 11:58:18 +02:00
Lianhao Lu
59f90f5194 devstack: allow ceilometer-api and keystone to run on different hosts
User now can specify CEILOMETER_SERVICE_HOST to a different host so
ceilometer-api and keystone can run on different machines. Also create
keystone accounts in post-config phase, by following gnocchi convention.

Change-Id: Ide55f9e07d4d94e900a3596922da4c40eca8ec3c
2016-03-23 05:56:01 +00:00
Lianhao Lu
49a204e41a Devstack: install coordination backend for compute agent
Since compute agent now supports coordination, we need to install
the corresponding backend too.

Change-Id: I680a25ba089504e62930f61615f5a509480fe432
2016-03-23 03:29:30 +00:00
Jenkins
001d706b5c Merge "clean devstack plugin" 2016-03-21 19:25:02 +00:00
ZhiQiang Fan
337cd3c41b remove SERVICE_TENANT_NAME from devstack plugin
Previously we have to set this option to enable Aodh integration test
because there is circle dependency, but now since Aodh can parse
SERVICE_PROJECT_NAME properly, this is safe to remove.

Change-Id: I014ec7d62edfcc433b84e9237a63e37c427747ec
2016-03-19 04:23:52 +08:00
ZhiQiang Fan
7cae72527e clean devstack plugin
* remove verbose option: it is deprecated and True is its default value
* change [DEFAULT]notification_topics to [oslo_messaging_notifications]topics,
  the old style is deprecated
* remove uncleaned ceilometer-alarm-evaluator condition

Change-Id: If2d0592612c389e08826717fdf38d2e0086cec38
2016-03-17 08:55:54 +08:00
liusheng
8d7def1f7a Change the SERVICE_TENANT_NAME to SERVICE_PROJECT_NAME
The intergation test job has been broken, it seems because the replace
TENANT => PROJECT change in devstack scrpts, see[1]. This patch change the
SERVICE_TENANT_NAME to SERVICE_PROJECT_NAME in devstack plugin.

And to avoid with aodh change, this change temporarily skip the
gabbits-live test.

[1] https://review.openstack.org/#/c/281779/

Closes-Bug: #1548634
Change-Id: Ibb1f78d47311117f6718707c5961bc2841473924
2016-02-23 19:40:10 +08:00
Jenkins
7259b77565 Merge "KEYSTONE_CATALOG_BACKEND is deprecated" 2016-02-11 12:10:34 +00:00
gordon chung
7b23b3f185 KEYSTONE_CATALOG_BACKEND is deprecated
this removes it
see: http://lists.openstack.org/pipermail/openstack-dev/2016-February/086272.htm

Change-Id: Ic1ba628e00db114b4e2b219d094ab7db7e6e622b
2016-02-10 17:31:26 -05:00
Mehdi Abaakouk
b7d2c8eb43 devstack: Fix Keystone v3 configuration typo
When Keystone v3 is enabled, 'default' is the id, not the name,
of the domain created by devstack.

Change-Id: I244db7023cb3215dc6fe26d783c6338c8391a0f4
2016-02-10 10:14:03 +01:00
gordon chung
bb699bc3df set higher batching requirement
in practice, there are much more than 10 resources on the queue at
any given time so the amount of grouping done is minimal currently.
let's set a higher number so we have more groupings

Change-Id: I6bd0b9797f3a90c744002f4cf364faa696ab63ec
Closes-Bug: #1536277
2016-02-04 11:22:32 -05:00
Mehdi Abaakouk
ae591af8c1 devstack: use password with version discovery
Devstack will move to keystone v3, so support it here.

Change-Id: I2a6eb7ec63ab6d2d7ac5c8e162ef96197137a966
Closes-bug: #1539728
2016-02-02 17:36:17 +01:00
gordon chung
628ac86f48 enable notification agent partitioning
we should just enable this so we can at least catch major major
breakage.

Change-Id: Ib49257ac45c9baef997e24f5ae3327f951b97e2b
2016-01-26 14:13:31 -05:00
Mehdi Abaakouk
c1120aed0d Don't store events with Gnocchi
Since we move the Gnocchi configuration in Ceilometer devstack plugin
the event subsystem is enabled but unconfigured. So disable the
event subsystem by default if Gnocchi is used like before.

Change-Id: I33a6e962dcd01e12f828c4c126f6220439e5bfac
2016-01-19 19:52:18 -05:00
Julien Danjou
014fa900cd devstack: add support for Gnocchi backend
Change-Id: Ie5beee502ab07e4fca3353dae03c2f1f524a48c7
2016-01-18 14:28:40 +01:00
jizilian
c8c6c670ad Fix the typos in the source code
Scan the source code and filter some results. Fix the typos in
the source code. Will deliver remaining results in other patches.

ceilometer/event/trait_plugins.py
Line 169: s/it's/its

/ceilometer/publisher/kafka_broker.py
Line 58: s/this option is/options are
Line 60: s/with with/with

devstack/plugin.sh
Line 400: s/the the/the

doc/source/install/manual.rst
Line 557: s/seperately/separately
Line 567: s/requirments/requirements

Change-Id: Ia4577724977ec255ad426c7c9647ac26d0280f24
2015-12-22 21:54:15 -05:00
gordon chung
c410ff9e82 Revert "Revert "devstack config for dogpile cache""
This reverts commit a0bb0f16b1fd9785ceb5a8dc933ba2bcae54412a.

Closes-Bug: #1519477
Co-Authored-By: Chris Dent <cdent@anticdent.org>
Change-Id: I34aa352c39d80692d7c3aa71eb108f0257d36484
2015-12-15 19:47:43 +00:00
gordon chung
d118fb6a00 clean up integration test urls
the endpoints for aodh, ceilometer and gnocchi end with trailing
slash. because of that, our tests are calling <endpoint>//<path>.
this works but is technically incorrect. this patch cleans it up.

Change-Id: Ieed46c38fff4e7ea86f0f5eeab105c70b6249003
2015-11-25 18:04:30 -05:00
Jenkins
8a3e799de5 Merge "remove config files when run clean.sh" 2015-11-25 09:50:00 +00:00
ZhiQiang Fan
af85965f55 remove config files when run clean.sh
Currently we don't remove Ceilometer config files when ./clean.sh
is run, which should be fixed because it will bite developers when
they test change related to devstack script.

Note, this patch also removes ceilometer api log files when WSGI
is not enabled.

Change-Id: I3fd62787708cf64d1860b2b64d25773e79b17fe9
Closes-Bug: #1509253
2015-11-25 03:40:08 +08:00
Julien Danjou
6bc86f75ea Remove alarming code
Since we moved all the alarming code and subsystem to the Aodh project,
remove it from Ceilometer.

Depends-On: I3983128d2d964b0f1f3326948b27f5d94df65a04
Depends-On: I99c9f2be0bbc70f289da5c2ba22698b8b7dc4495
Change-Id: Id169a914c1d1f2f5ad03ebb515d3d052204d5c5c
2015-11-24 13:44:58 +01:00
ZhiQiang Fan
0ba0ba7270 install database when collector is enabled.
Currently, if we run devstack for compute node, ceilometer-collector
service will be disabled on compute node, but the database is still
installed.

This patch makes sure that database is installed only when collector
is enabled.

Also add check for coordinate and hypervisor requirements.

Change-Id: Ib3614d2e698403c24ad299d95ef42c81815fa76e
Closes-Bug: #1508518
2015-11-13 19:40:14 -07:00
ZhiQiang Fan
9c3278c942 configure Apache only when ceilometer-api is enabled
Currently, even though ceilometer-api service is disabled by user,
we still try to configure ceilometer-api in Apache if CEILOMETER_USE_MOD_WSGI
is not set to false. This patch adds a constraint to ensure we only
configure when ceilometer-api is enabled.

Change-Id: I3f2bab3f646f7df57c32db3251f811cb801d93de
Partial-Bug: #1508518
2015-10-23 02:26:13 -06:00
venkatamahesh
c536305d35 Added the README.rst in devstack folder
Change-Id: I633f06c54a22403996adf6431be9cd714cce1b51
2015-10-17 07:24:50 +05:30
Chris Dent
cac2b26d06 Do collector setup and storage cleanup for all backends
It appears that a bit of overzealous copy and pasting of commands has
meant that:

* the number of collectors was not being set for mongodb, which may
  be a cause of performance issues in the gate
* the cleanup was not being called for the sql backend, which leaves
  behind wsgi config files when that backend is chosen

Change-Id: I013f14f8b167e564f794333c0fe5c8f421bb25a9
2015-10-13 09:17:01 +00:00
ZhiQiang Fan
27822d05c9 change collector_workers to [collector]workers
We have deprecated collector_workers, let's update it in devstack as
well.

Change-Id: I914d34998ca357b1dea117229fbee494509d8f57
Closes-Bug: #1505555
2015-10-13 01:05:27 -07:00
Chris Dent
614d7422d5 Be explicit when copying files to /etc/ceilometer
If we use a glob too many files are attempted to be copied and we can
cause two issues:

* there can be a permission problem because an earlier call to
  configure_rootwrap already wrote some files as root
* iniset calls on ceilometer.conf that already happened will be
  clobbered

Change-Id: I960256cdd2c32bbbe4591282e8a56ee156541667
Closes-Bug: #1503338
2015-10-09 13:49:02 +00:00
Jenkins
39469d25a7 Merge "Add missing ceilometerclient repo location" 2015-10-07 21:11:24 +00:00
Chris Dent
0f0b725935 Remove last vestiges of devstack from grenade plugin
lib/ceilometer no longer exits so we must source our plugin to get
stop_ceilometer

Change-Id: I059cc24eae046df195573c0f1a90cd52e8ef1c7e
Depends-On: I01d00f95d602b9b159b3b64ff46a7cd3e23c3983
2015-10-06 12:34:23 -04:00
Mehdi Abaakouk
1305987b17 Add missing ceilometerclient repo location
Change-Id: I7cbe0afa12c9d11ce2eaed1f4d29f41507e273f8
2015-10-06 17:21:16 +02:00
Julien Danjou
e6087c9570 devstack: install all configuration files from etc/
All those files need to be installed.

Change-Id: I5b9da5e959e94a22c322c73249d00c729b171efb
2015-09-25 23:50:32 +02:00
Jenkins
15b07a2b6e Merge "devstack: add new option to support event-alarm" 2015-09-11 02:50:38 +00:00
Jenkins
2fc2bfb42e Merge "polling: remove deprecated agents" 2015-09-08 20:05:06 +00:00
Julien Danjou
43e07a393d polling: remove deprecated agents
We have deprecated the agents for a while now in favor of the
ceilometer-polling tool, let's update the doc for good and remove them.

Depends-On: I4a2a982d4153a31971a5f1a1b504b96ce29236f9
Change-Id: I7447ba4f408c95b0acf1b809504ce16fff1c6e21
2015-09-07 10:20:29 +02:00
Ryota MIBU
5670ffebb6 devstack: add new option to support event-alarm
Change-Id: I71c11f3c57e4a055893a80083ce472cc92e27fb9
2015-09-03 18:56:12 +09:00
Chris Dent
f24d1f43cc Sync devstack plugin with devstack:lib/ceilometer
This removes the cp of the meters.yaml file to /etc/ceilometer. It
is not needed.

This is part of a regular process of keeping the plugin and the
devstack version functionally equivalent until the devstack version
finally goes away.

Change-Id: I1261f054f077b73d3d64529ca9c59678ecbf15de
2015-09-03 09:25:20 +01:00
Chris Dent
788a8341db Create conf directory during devstack install phase
Otherwise other plugins which depend on ceilometer and want to set
configuration items may have issues with the configuration directory not
being there.

Change-Id: Id8d10c9fcdd85e2840a74dcff5245b6f44f7424b
2015-08-26 10:21:33 +00:00
Jenkins
6978e301b3 Merge "Revert "Remove version from os_auth_url in service_credentials"" 2015-08-14 12:19:29 +00:00
Chris Dent
055ebb9d21 Revert "Remove version from os_auth_url in service_credentials"
This reverts commit 33f133ab0cd37da5366769603ece67877505e7c9.

Apparently the way keystone info is used in aodh is different from how
ceilometer uses it. With the change to be reverted in place, none of the
agents can talk to services.

Change-Id: I462f7c4977f14e45069e2c826abd7944252bd9d9
2015-08-14 10:18:47 +00:00
Jenkins
56416fec25 Merge "Grenade plugin using devstack plugin for ceilometer" 2015-08-13 15:37:27 +00:00
Chris Dent
33f133ab0c Remove version from os_auth_url in service_credentials
In these modern times it appears to be redundant, confusing, and
inflexible.

Change-Id: Ice84fc6042e7ee344f86ac675c5f833f9984db8c
2015-08-13 10:33:59 +00:00