130 Commits

Author SHA1 Message Date
Jenkins
d3302a7e69 Merge "Add Senlin Ansible role" 2016-09-14 15:01:34 +00:00
Jenkins
1109c25b60 Merge "Fix missing cloudkitty config file for cron container" 2016-09-14 07:20:43 +00:00
Eduardo Gonzalez
abf83650a1 Add Senlin Ansible role
Change-Id: Ic941a396b5cd9abfb5e9941218e91b784f8bba0a
Implements: bp senlin-container
2016-09-14 07:20:22 +02:00
Jenkins
ae9c246315 Merge "fix the common upgrade" 2016-09-14 05:12:57 +00:00
Hui Kang
a14d8e6a24 Fix missing cloudkitty config file for cron container
Change-Id: I6a2c158ae9bad9a824d04056b70a2d0cbe765a55
closes-bug: #1623314
2016-09-14 03:36:22 +00:00
Jeffrey Zhang
bd08f55989 fix the common upgrade
Closes-Bug: #1623305
Change-Id: I21ca191cb5a45b0beb97dfe67a209999b9033cb0
Signed-off-by: Jeffrey Zhang <zhang.lei.fly@gmail.com>
2016-09-14 02:54:29 +00:00
Jenkins
292baae4ff Merge "Add logrotate configuration for cloudkitty" 2016-09-13 19:50:30 +00:00
Christian Berendt
a62aaaf824 Add logrotate configuration for cloudkitty
TrivialFix

Change-Id: I7cd8133b7677e67ea650163a5e56e157276eb9b8
2016-09-13 14:31:10 +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
zhubingbing
e0537385d0 Add Barbican ansible role
Partially-Implements: blueprint barbican-ansible

Change-Id: Id6be35b1d0527d5c38d4ea8576b233ebcc404718
2016-09-13 02:56:27 +00:00
zhubingbing
89392f4f6a Add gnocchi ansible role
Partially-Implements: blueprint ansible-gnocchi

Change-Id: I8dd0460bd21ac0a233fab0142ec7b6079459bdc2
2016-09-06 13:17:47 +00:00
Jeffrey Zhang
7f8b40538f
Use the standard start method for kolla-toolbox container
TrivialFix

Change-Id: Icb092e47713e0b89859747d6ed4c02b3950d7ced
Signed-off-by: Jeffrey Zhang <zhang.lei.fly@gmail.com>
2016-09-02 00:06:47 +08:00
Jenkins
b29357e70c Merge "Add aodh role" 2016-08-31 12:52:58 +00:00
zhubingbing
7ce05f9782 Add aodh role
Partially-Implements: blueprint ansible-aodh

Change-Id: I9e20f4bf5e7d8f37f243ae15746e2b7bb49eb20c
2016-08-31 03:54:35 +00:00
Christine Hicks
42bd52037e Changed admin-openrc from DOMAIN_ID to DOMAIN_NAME
OpenStack used to used DOMAIN_ID and has switched to DOMAIN_NAME.

TrivialFix

Change-Id: Ibb0574f9267a3bc276304c8079cb230068a13273
2016-08-26 13:09:07 -04:00
liyingjun
54be45e406 Fix toolbox permission issue when enabling ceph
Directory /home/ansible/.ansible and file /var/log/kolla/ansible.log are
not created by default in toolbox image, so when ceph enabled, the directory
and file will be created with user 'root' instead of user 'ansible' after
running bootstrap osds because it using sudo when bootstraping osds,
this will cause permission denied issue for other commands not using sudo.
Fixes this issue by initializing ansible by running 'ansible localhost
--version' using user 'ansible'

TrivialFix

Change-Id: Ibac3f98b3b72cbe287ee1d3a69ed9cea7ae3cd9e
2016-08-26 00:46:46 +00:00
Jenkins
c44edb3659 Merge "Move the keystone_*_url variable from common role to group vars" 2016-08-18 03:14:37 +00:00
Jeffrey Zhang
3d6344d800 Move the keystone_*_url variable from common role to group vars
keystone_*_url are cross role variables. They are used in multi roles.
Move them from the common role to the group vars

TrivialFix

Change-Id: If451823ed7612bfec7bc797ec9dd2597164c6804
2016-08-17 16:53:40 +08:00
jackning
173d254086 Add heka custom config to define user's log pipline
Kolla's default heka pipline may not satisfy user's requirements,
for example, sending openstack log to outer log analyze system.
So it is necessary to add heka custom configuration for define
user's encoders, outputs and other plugins.

Change-Id: I48bd8d7e0afbc2d023c49c83041f87a04970bbb6
Closes-Bug: #1611164
2016-08-08 21:44:03 -04:00
Christian Berendt
4cd95dbcc5 Enable central logging without deploying elasticsearch/kibana
This changed introduces 4 new parameters to be able to use an existing
elasticsearch service for central logging.

* elasticsearch_address - address of elasticsearch server
* elasticsearch_protocol - protocol (HTTP/HTTPS) used by elasticsearch server
* enable_elasticsearch - deploy elasticsearch container
* enable_kibana - deploy kibana container

Closes-bug: #1584861

Change-Id: Ia1ff9ae8b6d9929c3826da02693d1e2fc9ea2522
2016-08-03 21:59:51 +02:00
Ken Wronkiewicz
a6d89f44e9 Horizon interface address and memcached override
Note: This should not result in any behavior changes in regular Kolla, just
Kolla-Kubernetes and only when you've overridden stuff in globals.yml

Allows override of interface address and memcached pools, so that Kubernetes
can do the right thing.

There are some significant architectural issues involved in memcached pooling
in the Kolla-kubernetes world.  Avoiding them right now.

Current working with this Kolla-Kubernetes globals.yml file:

api_interface_address: "0.0.0.0"

memcached_servers: "memcached"

keystone_database_address: "mariadb"
keystone_admin_url: "http://keystone-admin:35357/v3"
keystone_internal_url: "http://keystone-public:5000/v3"
keystone_public_url: "http://keystone-public:5000/v3"

Three tings to note:
 * In Kolla-Kubernetes, the service is not using net=host, so a
   0.0.0.0 interface address is totally OK.  That patch has been merged.
 * In Kolla-Kubernetes, the global.yml file doesn't do var substitution
   so you have to be explicit about the URLs, otherwise Keystone will
   look like it was provisioned but it won't quite be provisioned right.
 * In order to not duplicate tons of code, moved the keystone_admin_url /
   keystone_internal_url / keystone_public_url to the common defaults
   from the keystone defaults.

Co-Authored-By: Ryan Hallisey <rhallise@redhat.com>
Change-Id: I586ce1c6c3300254c4e2a398ff46645df576aeb0
Partially-implements: blueprint api-interface-bind-address-override
2016-08-02 12:39:22 -04:00
Dave Walker (Daviey)
c3a6aa684a Add Watcher ansible roles and templates
Previous work on Watcher added the Docker images, this
change adds the ansible configuration.

There is support for HA, via haproxy to balance across the
Watcher API hosts.

There is also a hook into nova.conf to conditionally add
Nova compute Host metrics via Ceilometer if Watcher is enabled.

This defaults to enabled false.

Change-Id: I8763528bb6ff12943b810212c71396d2d7cf6836
Partial-bug: #1598929
Partially-implements: bp watcher
Signed-off-by: Dave Walker (Daviey) <email@daviey.com>
2016-07-22 11:45:19 +01:00
Paul Bourke
5d5b209823 Add 'optional' param for mariadb heka conf
If one is using an existing or alternative mysql deployment and sets
enable_mariadb to false, heka would fail to deploy.

TrivialFix

Change-Id: Ieb793e11a40358e5d4fc1f3955f200e2cddef4f5
2016-07-15 11:02:59 +01:00
Ryan Hallisey
f5e0a3959b Change ansible image to kolla_toolbox
All the images follow the same naming schema where the container
name is part of the ansible variable name.  Currently, the
kolla_toolbox container is named ansible_image_full.  Change
this to match what the container name is.

Could impact operators who are specifying ansible_image_full
in globals.yml.

TrivialFix

Change-Id: I9f0cbe4bd69ce17489310a1f5734a254e6ebe27b
2016-05-23 10:13:48 -04:00
Mauricio Lima
1a2fe93a95 Make Heka collect Ceph logs
Change-Id: Ibaa5f8ba600afafa111d2ef204ee9192b8babdfc
Closes-Bug: #1570529
2016-05-05 13:26:44 -04:00
Jeffrey Zhang
0fcee87549 map the host localtime to the container
Closes-Bug: #1577148
Change-Id: I636cefc63cf532434a41af3898b63dffa711e280
2016-05-03 09:27:51 +08:00
Vikram Hosakote
df53d92db6 Revert "Add general_log to mariadb container and make heka collect it"
This reverts commit 86bafeee7a8926d212e8d089fade667772dbcc83.

Closes-Bug: #1568670

Change-Id: I88563292e29d691c27a3640e5232b9f22c7a288a
2016-04-11 02:49:56 +00:00
Jenkins
5f6d4d10d4 Merge "Make Heka write Keepalived logs to dedicated directory" 2016-04-05 05:39:54 +00:00
Jenkins
dc9990e744 Merge "Add general_log to mariadb container and make heka collect it" 2016-04-04 10:51:19 +00:00
Vikram Hosakote
86bafeee7a Add general_log to mariadb container and make heka collect it
Added general_log to ansible/roles/mariadb/templates/galera.cnf.j2
to improve mariadb logging.

This will be helpful to debug mariadb issues especially when
mariadb is scaled.

Test results of this patch set are at:
http://paste.openstack.org/show/492852/

Change-Id: I80438d1bbdd1ed2a1f47489c6f9c45b8107340a0
Closes-Bug: #1563668
2016-04-04 02:52:30 +00:00
Carlos Cesario
1e8abe3592 Make Heka write Keepalived logs to dedicated directory
Currently Heka writes the keepalived logs in
/var/log/kolla/haproxy/keepalived.log.
This commit changes this to /var/log/kolla/keepalived/keepalived.log.

Closes-Bug: #1565499
Change-Id: I3033097bd77ddbf72948697b34a6a499ea903083
2016-04-03 18:55:00 -03:00
Jenkins
808d6baa44 Merge "Change keystone log dir" 2016-04-03 00:48:09 +00:00
Jenkins
3a028e4334 Merge "Revert libvirt change in heka-openstack.toml.j2 in master" 2016-03-31 06:43:48 +00:00
Mauricio Lima
9a910d6b1e Starting heka bootstrap container failed in deployment
Change-Id: I7efa3f5df3a5743d264864070967cf995900b147
Closes-Bug: #1561111
2016-03-29 15:24:47 -04:00
Carlos Cesario
493650aa5e Change keystone log dir
Proposed patch to change keystone and heka log dir
from /var/log/kolla/apache2/ to /var/log/kolla/keystone/

Closes-Bug: #1560620
Change-Id: I70c65ceba5a301cc56880313ca86f01bd35676cb
2016-03-28 08:51:35 -03:00
Vikram Hosakote
4e60b9917f Revert libvirt change in heka-openstack.toml.j2 in master
This is consistent with the patch set in
https://review.openstack.org/#/c/296012/ for stable/mitaka

The new lua parser for libvirtd.log so that libvirtd.log can be
parsed in the Kibana dashboard will be implemented in a separate
patch set (in both master and backported to Mitaka).

TrivialFix

Related-Bug: 1560298
Related-Id: I1bc8bdb3180f30dc69af28a35fa057ac801bde0f
Change-Id: I59938a4e99abc676c391e535405417701aae2767
2016-03-23 23:51:48 +00:00
Jenkins
2bed01f981 Merge "MariaDB is not copied if enable_rabitmq is disabled" 2016-03-23 15:51:42 +00:00
Jenkins
73f55d3d6f Merge "Swift busted with Heka" 2016-03-23 12:36:44 +00:00
Jenkins
47cce66181 Merge "Changes horizon log location to kolla_logs volume" 2016-03-23 07:09:05 +00:00
Steven Dake
fea486a7f0 MariaDB is not copied if enable_rabitmq is disabled
Eric spotted this on IRC.  Submitted a bug and patch
on his behalf since he isn't available to work on Kolla
in the next few hours.

Co-Authored-By: Eric Lemoine <elemoine@mirantis.com>
Change-Id: I91efdd540170a391228d247c2e6e533e6c87b951
Closes-Bug: #1560819
2016-03-23 02:48:40 -04:00
Steven Dake
8307b06a46 Swift busted with Heka
Swift and heka were broken by an optimization that resulted in
a regression in commit:
0a1486a2c73275009f7158c911e7bfd683e40a58

This patch fixes that problem.

Change-Id: I02c6cf4de4f807c3ec66e2d4f59f182d0b864ea3
Closes-Bug: #1560788
2016-03-23 02:08:29 -04:00
Serguei Bezverkhi
8ec7811037 Changes horizon log location to kolla_logs volume
Changes location of Horizon log, they will be stored on common log volume
kolla_logs.

Change-Id: Ie9d56999a83efd05ab7c3dcb00b4dc42c9bce8f8
Closes-Bug: 1560250
2016-03-22 18:26:18 -04:00
Vikram Hosakote
7af0ab9ba9 Make heka collect libvirtd.log in nova_libvirt container
Test results of this patch set are at:
http://paste.openstack.org/show/491382/

Change-Id: I1bc8bdb3180f30dc69af28a35fa057ac801bde0f
Closes-Bug: #1560298
2016-03-22 03:23:41 +00:00
SamYaple
f4175f04d7 Fix 'optional' config.json values
These values are optional only when the services are not enabled.

If the file does not exist we should not warn, but rather inform.

Ceph-mon is an exception here since its bootstrap process means
the files may or may not exist initially.

TrivialFix

Change-Id: Ic02bece76d480e99deecf612036f37abb5604135
2016-03-19 23:01:27 +00:00
SamYaple
0a1486a2c7 Rework heka log copying
Now that we have reconfigure we dont have to copy over all config
files at the same time.

TrivialFix

Change-Id: I866be0f05e604151e081974a64f17bf65787f604
2016-03-19 23:01:15 +00:00
SamYaple
b160a78995 Add cron to pull playbooks
TrivialFix

Change-Id: I9e7e65d6e5ddfb3c387e147a8cc6f5aae1aab0cd
2016-03-17 17:13:38 +00:00
Jenkins
a28b246259 Merge "Add cron image and playbook" 2016-03-10 20:22:15 +00:00
Éric Lemoine
32a4cadac9 Add cron image and playbook
Add cron image and playbook for logrotate.

The "common" Ansible playbook includes configuration files for
logrotate. At this point the operator cannot customize/override the
logrotate configuration.

Closes-Bug: #1553244
Change-Id: Ic9fdda9a273c9ccd90502f0acc7614d2c7157dca
2016-03-09 13:53:55 +01:00
SamYaple
7b6fbdf41d Remove storage_hostname
This was an attempt to get storage_interface to work properly but that
work will not be completed and functional this cycle. There are design
topics that need to be discussed about it that were brought to light
by the RAX gate failing for it.

TrivialFix

Change-Id: I65579f9e0e0dcf3fa51c0ea031ff474145457c40
2016-03-09 12:08:15 +00:00
Jenkins
f14b931286 Merge "Copy the logs out of the container" 2016-03-09 04:17:50 +00:00