60 Commits

Author SHA1 Message Date
Jenkins
2ec6e07d6d Merge "Remove store_events parameter from ceilometer configuration" 2016-12-06 13:28:14 +00:00
Christian Berendt
ad7157ea94 Remove store_events parameter from ceilometer configuration
The store_events parameter was removed from ceilometer collector
service with https://review.openstack.org/#/c/367982

Change-Id: If08c280949a2ef5274cc8b029750f98d6f6af79b
Closes-bug: #1647585
2016-12-06 10:18:56 +00:00
Eduardo Gonzalez
775d8019b6 Add custom policies in service.json
Include custom policy.json files in service-api.json.j2 files

Change-Id: Ic55bfc6f61131aa72c3497ce8b2282056bcc7f92
Partially-Implements: blueprint custom-policies
2016-12-02 16:22:17 +00:00
Duong Ha-Quang
b5d1e4b457 Fix placement of policy.json
Currently, policy.json is put in
"{{ node_config_directory }}/{{ service_name }}"
in target nodes.

Relocation policy.json to "{{ node_config_directory }}/{{ item }}"
with item is corresponding service compoment config directory.

Currently, the policy.json is copied to all services, but it
should be reviewed and left only in neccesary service
(at many cases, only API service needs that).

Redundant files will be removed in follow up patchset.

Change-Id: I0e997dccf4ec438c9c0436db71ec2fd06650f50d
Closes-Bug: #1639686
2016-11-29 16:00:09 +07:00
Javier Castillo Alcíbar
b13c40f586 Make sure ceilometer/service_credentials wotks with internalURL
When configuring kolla with

 - kolla_enable_tls_external: "yes"

ceilometer service credential defaults to publicURL.

Ceilometer should work with the internal interface (v3 API Identity syntax):

.....
[service_credentials]
interface = internal
.....

Change-Id: I898ffb2b901f08b810756d80dbb988d8c9298219
Closes-Bug: #1643860
2016-11-22 16:21:48 +01:00
Jenkins
d389d7aacf Merge "Exclude port from ceilometer_database_mysql_address" 2016-11-11 13:07:15 +00:00
Farid Da Encarnacao
db99a79c02 Corrects typo "mondodb_port" in ceilometer
Closes-Bug: 1640872

Change-Id: I3bd979af5626d016ec79696ab157e376476f5d28
2016-11-10 18:45:52 +00:00
Vladislav Belogrudov
a2bfe399a8 Exclude port from ceilometer_database_mysql_address
Users can specify database address and port for mysql backend
of Ceilometer. Currently ceilometer_database_mysql_address
incorrectly includes port. This is unnecessary, also Ceilometer
bootstrapping (mysql_user, mysql_db Ansible modules) wants to use
these variables separately.

Change-Id: I88f5359517fcf4f119ec6abfdf16a15a4e33b6fd
Closes-Bug: #1639786
2016-11-07 16:17:11 +03:00
Vladislav Belogrudov
ce8978884e Allow flexibility in mysql backend for ceilometer
This fix adds possibility to configure external mysql database
backend with a different set of credentials, i.e. not requiring
external db admins to provide or match their passwords if
ceilometer user and database already are preconfigured.

Change-Id: Icb78e069770adcc6d2437caca173a5852177178f
Closes-Bug: #1638238
2016-11-06 13:08:14 +00:00
prameswar
5076268296 when condition corrected in ceilometer config.yml
Closes-bug: #1639492

Change-Id: If27f246db539426a64377db5fcbe8e62eb85f4d0
2016-11-06 00:41:15 +05:30
Jenkins
520ac1823c Merge "Make number of ceilometer-api processes configurable" 2016-11-04 14:39:00 +00:00
Jenkins
dbc881456b Merge "Custom policy files" 2016-11-04 13:42:55 +00:00
Jeffrey Zhang
fa45801946 Move precheck into its own role
* Merge prechecks.yml and site.yml playbook
* Create empty precheck.yml into all roles.

Change-Id: I8a138558a26c0a2a66c5fd48ed37be657c99c1dd
Implements: blueprint condition-pre-check
2016-11-03 14:48:58 +08:00
Eduardo Gonzalez
ef1fd6b8c0 Custom policy files
Allow operators to use their custom policy files.
Avoid maintain policy files in kolla repos, only copying
the files when an operator add their custom config.

Implements: blueprint custom-policies
Change-Id: Icf3c961b87cbc7a1f1dd2ffbfffcf271d151d862
2016-10-28 10:47:05 +01:00
prameswar
8a63cf45b5 corrected line collapsing in ceilometer.conf
Closes-bug: #1635667

Change-Id: I256a39b6241d5b506f099fb98847af9417748702
2016-10-22 02:17:55 +00:00
prameswar
7ef0b41e0f corrected register variable name in ceilometer bootstrap.yml
Closes-Bug: #1635322

Change-Id: I6f3351d098dfd9a7c1c3e3e8b213134284f823f9
2016-10-20 21:04:56 +05:30
caoyuan
ed86c2bc49 Update 'addUser' to 'createUser'
The 'addUser' shell helper is DEPRECATED. Use 'createUser' instead.
TrivialFix

Change-Id: Ib8c7a8971f46328a666cf63f1914fe50c7067064
2016-10-19 16:10:32 +00:00
ZhongShengping
53150ca2c0 Memcache configuration for Ceilometer is broken
At the moment we use "memcached_servers =
{{ kolla_internal_fqdn }}:{{ memcached_port }}" in
keystone_authtoken for Ceilometer.
This cannot work because we our haproxy service does
not offer memcache, so fix it.

Change-Id: I7d9630b8b232f0e5e2a0a33304817a1b255d4855
Closes-Bug: #1634146
2016-10-19 09:12:58 +08:00
Jenkins
ab0f274564 Merge "Ceilometer cannot create standalone mysql database" 2016-10-17 17:59:33 +00:00
Jenkins
a963078d25 Merge "Fix configuration templates used for Ceilometer" 2016-10-17 17:03:29 +00:00
Vladislav Belogrudov
a60e47dce7 Ceilometer cannot create standalone mysql database
Users can configure standalone database but bootstrap takes
wrong address - instead of cluster VIP it should take
ceilometer_database_mysql_address. The latter is set to VIP by
default.

Change-Id: I7fc789e53565190c1d3b9966dc67f668237ebd83
Closes-Bug: #1634083
2016-10-17 17:01:41 +00:00
Jenkins
580fcde959 Merge "Fix stale namespace removal issue" 2016-10-17 16:48:00 +00:00
Christian Berendt
88bbd1bb24 Fix configuration templates used for Ceilometer
* global ceilometer.conf file is missing
* makes no sense to use glance configuration files for Ceilometer

TrivialFix

Change-Id: Ia37d28e8d854e6a1dc48bfa96afdaee2061be9a7
2016-10-17 16:17:45 +02:00
Jeffrey Zhang
ce5a11a374 Fix stale namespace removal issue
When using both /run and /run/netns in docker container, mount
propagation won't work when delete namespace after the containers are
restarted. This PS makes /run mount as shared.

Closes-Bug: #1616268
Change-Id: Ie16699e1b193b2bf1263d89ea634e89ea69add9e
2016-10-15 01:49:13 +08:00
Jeffrey Zhang
033a444fef Fix ceilometer idempotent
bootstrap_service in ceilometer should only be ran once during multi
deployment to keep idempotent

Partial-Bug: #1633463
Change-Id: Ic5d256e2e887661b4679c4518e8c3865b85189bf
2016-10-14 20:54:26 +08:00
Jenkins
a101a4484c Merge "Fix wrong mongodb address variable in ceilomter bootstrap" 2016-10-13 16:59:19 +00:00
Jenkins
45b0f2cf63 Merge "Remove do_reconfigure.yml file for all roles" 2016-10-13 16:20:30 +00:00
Jeffrey Zhang
6796a95820 Fix wrong mongodb address variable in ceilomter bootstrap
The correct variable is ceilometer_database_mongodb_address rather than
ceilometer_database_address

TrivialFix

Change-Id: I1d5331b5b9e1433c7b271a999ce47941d9a447eb
2016-10-12 23:56:42 +08:00
Christian Berendt
d8dd75b510 Make number of ceilometer-api processes configurable
TrivialFix

Change-Id: I3c297e1b967ca76b7a697bcef6ca30c9fbbe4298
2016-10-10 14:10:05 +02:00
Jeffrey Zhang
18fa72c901 integrate gnocchi with ceilometer
Closes-Bug: #1626364
Change-Id: I9d586b950b7099a9b160f7b32c9ff00b189a0287
2016-10-09 03:04:07 +00:00
Jeffrey Zhang
ca26f55d5c Mount host localtime for ceilometer
Change-Id: Ia4a9e132683a8328cb2ff6d7e28e3560f2a8614e
Closes-Bug: #1628584
2016-09-28 23:49:34 +08:00
Jeffrey Zhang
fa856556d5 Remove do_reconfigure.yml file for all roles
do_reconfigure.yml is introduced to use serial directive. But we use
it in wrong. Now serial has moved to playbook file. So it is time to
remove the do_reconfigure.yml file

Closes-Bug: #1628152
Change-Id: I8d42d27e6bc302a0e575b0353956eaef9b2ca9fd
2016-09-27 15:04:00 +00:00
Jeffrey Zhang
7555054e72 Fix the failure of ceilometer-api container
* ceilometer-api script is removed and run ceilometer-api by using apache
* fix connection url in ceilometer.conf

Closes-Bug: #1624905
Change-Id: Iffb00ca418bab6521d61b16de4f5760aa1ae1ac7
2016-09-25 14:01:43 +00:00
Jeffrey Zhang
873551030a Add pulling ceilometer-collector image
TrivialFix

Change-Id: I72670b61c50ff30a6f9c17e99b60e4e99529c062
2016-09-20 03:34:56 +08:00
caoyuan
a95a037f44 Add "---" into ceilometer/tasks
TrivialFix

Change-Id: Ic822c205012161ce71b6104a39ce9b70d6a0fcea
2016-09-19 18:05:06 +08:00
Christian Berendt
b76a613f47 Fix ceilometer.conf template
mongodb_port is already part of ceilometer_database_address

TrivialFix

Change-Id: I1eabd5e6d59215eea624d1b242b4e3820cf206ce
2016-09-15 12:27:36 +02:00
Mick Thompson
4c1482b999 Added serial option to site.yml.
Useful for upgrade etc., which is preferablly done serially.

Example usage: tools/kolla-ansible deploy OR tools/kolla-ansible upgrade

Closes-Bug: #1576708

DocImpact

Change-Id: I34b2e16f8ce53e472a4682a4738c4ac0f5abf00c
2016-09-13 09:26:51 +00:00
Jenkins
ea747d7ce2 Merge "Implement mongodb replication set cluster" 2016-09-13 06:35:16 +00:00
Paul Bourke
82f6d3f44b Allow mysql to be used as a database for Ceilometer
MongoDB is still default.

Refer to
http://docs.openstack.org/developer/ceilometer/install/dbreco.html for
more info on Ceilometer database backends.

Closes-Bug: #1622532

Change-Id: Iaf84f9efe0537f42797f4bb7ba2a3611835cc84e
2016-09-12 11:41:35 +00:00
Jenkins
27b4f6fc7f Merge "Add precheck for ceilometer backend" 2016-09-05 01:39:47 +00:00
liyingjun
c6dd71411a Add precheck for ceilometer backend
Currently when set enable_ceilometer: true and enable_mongodb: no,
the deploy will fail with ceilometer database creating error.
Add a precheck to avoid this situation in both prechecks and bootstrap.

Change-Id: I2d46ef9adeb8e028f3c18e6bc2d3752cc39bcb29
Closes-bug: #1605522
2016-09-01 23:23:28 +08:00
Jeffrey Zhang
d255743601
Move to transport_url for rabbitmq configuration
rabbit_hosts, rabbit_userid and rabbit_password are deprecated for
removal.[0]

rpc_backend is deprecated for removal.[1]

rabbit_ha_queues is deprecated. it is useless when using RabbitMQ >= 3.0
[2]

[0] https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/_drivers/impl_rabbit.py#L112,#L134
[1] https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/transport.py#L46
[2] https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/_drivers/impl_rabbit.py#L163,L174

Closes-Bug: #1614082
Change-Id: I05d318ba6c11c5dbfa9fbf67d088a43ab465be30
2016-08-25 16:07:42 +08:00
Jeffrey Zhang
066173bec0 Implement mongodb replication set cluster
Closes-Bug: #1605457
Change-Id: I1a8e746f79f4dfcc5a43e736c3461b316db3f593
2016-08-20 17:30:29 +00:00
Jenkins
c2e578b375 Merge "Add upgrade tasks for Ceilometer" 2016-08-14 14:08:03 +00:00
Jenkins
54c745fc36 Merge "Port with_ loop variable syntax to Ansbile 2" 2016-08-10 06:44:00 +00:00
Duong Ha-Quang
34975e291e Port with_ loop variable syntax to Ansbile 2
Migrate to full variable syntax in with_ loop
instead of bare variables for:
- ceph
- ceilometer
- glance
- heat
- horizon
- keystone
- mariadb
- memcached
- neutron
- nova
- rabbitmq

Change-Id: Ib925b4ecea47ac758a77739c9c7e140f06933b08
Partial-Implements: blueprint ansible2
2016-08-09 23:23:21 +07:00
Christian Berendt
823cb33aec Remove unused project_yaml parameter from role metadata files
TrivialFix

Change-Id: I7ff752fffe47e9571ea15acdad3edd4835f9e612
2016-08-07 22:18:17 +02:00
ZhongShengping
b8657a831f Add upgrade tasks for Ceilometer
Change-Id: I195363ab543f21bc9ac7f0b92d474dc9668ecb7b
Closes-Bug: 1608519
2016-08-04 14:18:34 +08:00
Jenkins
6d6cf1dc4c Merge "Add empty upgrade.yml file to ceilometer role" 2016-08-01 12:59:02 +00:00
Christian Berendt
2730005c47 Add empty upgrade.yml file to ceilometer role
TrivialFix

Change-Id: Iab9cb7e188f441a0583464df64d006d1fb75ba43
2016-07-24 20:56:54 +02:00