94 Commits

Author SHA1 Message Date
Bertrand Lallau
afdd11b9a2 Generalize api_interface_address variable usage
Useful api_interface_address variable has been define here:
https://github.com/openstack/kolla-ansible/blob/master/ansible/group_vars/all.yml#L57
In order to simplify codebase we must use it as much as possible.

Change-Id: I18fec19bf69e05a22a4142a9cd1165eccd022455
2017-05-23 08:35:15 +00:00
shaofeng_cheng
9e158b7887 Fix create and associate error of resellerAdmin
Fix the following error:
openstack_swift_auth is undefined
unsupported parameter for module: project
unsupported parameter for module: role

Change-Id: Id60e3f06e90e708d9054b905bbfd28ff5450fa49
Closes-Bug: #1691388
2017-05-17 18:05:08 +08:00
Jenkins
2474ccd0aa Merge "Fix ceilometer meters for swift service" 2017-05-10 10:49:05 +00:00
Jenkins
3b945400bc Merge "Fix panko source and dest file path in ceilometer config" 2017-05-09 03:53:32 +00:00
Jeffrey Zhang
e05b3ac0e1 Fix panko source and dest file path in ceilometer config
* Use absolute path for panko.conf.j2
* Fix the destination path.

Change-Id: I3abc0bf000be8af3a0cde1f43901245e027bb469
Closes-Bug: #1688681
2017-05-06 09:48:36 +08:00
Jeffrey Zhang
b1f015616c Add timeout parameter for precheck tasks
wait_for module waits 300 seconds for the port started or stopped.  This
is meaningless and useless in precheck. This patch change timeout to 1
seconds.

Change-Id: I9b251ec4ba17ce446655917e8ef5e152ef947298
Closes-Bug: #1688152
2017-05-04 09:02:25 +08:00
Jenkins
8297596c81 Merge "Add panko.conf file in ceilometer container" 2017-04-19 15:08:54 +00:00
Jeffrey Zhang
0defa3b3ea Add panko.conf file in ceilometer container
When using panko event dispatcher and publisher in ceilometer, it
depends on panko.conf file.

Change-Id: Ie91c072b233597758955b70bd526b2603b86e995
Closes-Bug: #1672241
2017-04-19 00:17:02 +08:00
shaofeng_cheng
a2568df906 Fix ceilometer meters for swift service
Enable Object Storage meters by ceilometer.
see
https://docs.openstack.org/project-install-guide/telemetry/draft/swift/install-swift-ubuntu.html

Change-Id: Ic80e02eacbe502280e09de6b845c0c7475273d6e
Closes-Bug: #1668826
2017-04-13 10:06:44 +08:00
Jenkins
d559f8096f Merge "Add gnocchi backend precheckes for ceilometer" 2017-04-12 12:24:13 +00:00
Jenkins
aae03a432e Merge "Apply correct permissions to kolla_logs/ceilometer" 2017-03-22 07:04:07 +00:00
caoyuan
1435cb5c64 Add gnocchi backend precheckes for ceilometer
when set ceilometer_database_type or ceilometer_event_type
set to 'gnocchi', but gnocchi is not enabled, prechecks action
can not find it out.

Closes-Bug: #1672626

Change-Id: Iadd1c66279fed012fb7c1cfb1f98857c36bbc75f
2017-03-14 07:39:35 +00:00
Jenkins
9d0daa015a Merge "Enable sanity checks from kolla-ansible" 2017-03-09 17:31:51 +00:00
Paul Bourke
5418ada148 Enable sanity checks from kolla-ansible
Add a new subcommand 'check' to kolla-ansible, used to run the
smoke/sanity checks.

Add stub files to all services that don't currently have checks.

Change-Id: I9f661c5fc51fd5b9b266f23f6c524884613dee48
Partially-implements: blueprint sanity-check-container
2017-03-09 10:37:06 +00:00
Jenkins
67a0c52a2d Merge "Fix Ceilometer cannot create MySQL database" 2017-03-08 15:55:44 +00:00
Eduardo Gonzalez
ea9b1577ad Apply correct permissions to kolla_logs/ceilometer
Ceilometer-*.json does not apply permissions at
kolla_logs/ceilometer as other roles do at config.json.
This is causing ceilometer-central to keep restarting
due cannot read/write to ceilometer-polling.log file.

Change-Id: I865bf01d6c3d87f1a2cf31976ca9e46bcbcad744
Closes-Bug: #1671020
2017-03-08 10:56:08 +00:00
Duong Ha-Quang
a2a9c17d51 Fix Ceilometer cannot create MySQL database
Due to kolla-toolbox return json object instead of just
plain string, we can use the object directly.

Change-Id: I55613f0f8ba97d1a14595c8c9b09e1ad6d2366e7
Closes-Bug: #1668521
2017-03-08 06:41:03 +00:00
Jeffrey Zhang
47762d4850 Fix the failure when running precheck after deploy
* Move the tasks to the role
* Skip the task when container is already running

Change-Id: I1990d4dd2a02efa2b3766329000aa23419e0ff17
Closes-Bug: #1670286
2017-03-07 06:57:16 +00:00
Duong Ha-Quang
2ade45e1c7 Fix Creating Ceilometer MongoDB database failed
The check whether 'already' presents in mongodb output
should belong to changed_when.

Change-Id: Ib982a59820d53ccf5439f59df50c1b1938650967
Closes-Bug: #1641113
2017-02-28 08:54:01 +00:00
Jenkins
d9740e9c40 Merge "Remove unnecessary until in register.yml file" 2017-02-22 12:28:06 +00:00
Jenkins
042a5f978e Merge "update dispatcher configurations for database backend" 2017-02-14 15:24:37 +00:00
Jeffrey Zhang
38ad05a872 Remove unnecessary until in register.yml file
Change-Id: I1577cc3afef4dadd3a188c8ba749c9cdfad313ae
2017-02-04 14:38:54 +08:00
Eduardo Gonzalez
4e0fa6a334 Remove hardcoded usernames in register.yml
Usernames can be configured with variables in
configuration files, but user creation is hardcoded.

Change-Id: I057cfb921d776217db66f59226dcfa79f3eb7368
Closes-Bug: #1661587
2017-02-03 12:17:54 +00:00
Narasimha SV
a354f03409 update dispatcher configurations for database backend
Ceilometer dispatcher configurations are there to have gnocchi as
backend but when we use mongodb or mysql dispatcher configurations
are missing.

Closes-Bug: #1640166
(cherry picked from commit d99659050763c71e63ed8b57cbf16d4ce85980fa)

Change-Id: I9cdfc6e2208978e72b76bff7f6a1cba80386ffa8
2017-02-01 11:13:13 +00:00
Jenkins
8884422f3d Merge "Refactor register.yml files" 2017-01-26 18:48:59 +00:00
Jeffrey Zhang
8155d74d8d Refactor register.yml files
Co-Authored-By: Mauricio Lima <mauriciolimab@gmail.com>
Change-Id: I9a4a6b6523dee4b388513386b7d85d421f2b7b89
2017-01-26 17:10:27 +00:00
caoyuan
7ec120aec3 Optimize reconfiguration for ceilometer
Change-Id: I9667e087f3dede751ce80734511e53761f5e9298
Partially-implements: blueprint better-reconfigure
2017-01-24 13:57:38 +00:00
caoyuan
9d165c7d89 Fix mysql database user of ceilometer
And fix a typo.

Change-Id: Iadfa5efd37a48cd0f23ab375da8fa1b65002fec2
Closes-Bug: #1658392
2017-01-23 04:26:49 +00:00
Jenkins
3f8cb8adda Merge "Refactor bootstrap.yml file" 2017-01-18 10:17:50 +00:00
Jeffrey Zhang
7233b45d29 Refactor bootstrap.yml file
Change-Id: I00d2dcb0895548ba169ab85764cf546c2214cbf5
2017-01-12 23:37:50 +08:00
Eduardo Gonzalez
a18174b3b4 Unify jinja syntax
Change-Id: I63197f8c5646e44a9a7287e644c904a1e227af23
2017-01-12 10:52:44 +00:00
Jenkins
b8c0f25fec Merge "Move ceilometer precheck into its own role" 2017-01-07 17:00:33 +00:00
caoyuan
3eb7ec6053 Move ceilometer precheck into its own role
refer to https://review.openstack.org/#/c/399354/

Change-Id: If33e4ad7358136b88965679a9877e87487f812ea
Partially-implements: blueprint condition-pre-check
2017-01-07 00:06:33 +08:00
zhubingbing
3e7ed2c42c add panko role
Change-Id: I515fdcdf6093e9e59dbbdc97221d23ed7f4e0a3d
Partially-Implements: blueprint add-panko-ansible-role
2016-12-15 08:01:50 +00:00
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