735 Commits

Author SHA1 Message Date
Jenkins
f14b931286 Merge "Copy the logs out of the container" 2016-03-09 04:17:50 +00:00
Jeffrey Zhang
12d6eeceb5 Copy the logs out of the container
Heka logs almost done. When testing, The collected logs can copy
to the /tmp/logs folder, which will be handle by the gate. This
will be very useful for our gate debug.

TrivialFix

Change-Id: I06ca8ebd13933bfd15cb2fb5e53fc3038b17b8c3
2016-03-09 09:34:59 +08:00
Jenkins
f2f88f5250 Merge "Reconfigure mongodb service" 2016-03-08 21:35:04 +00:00
Jenkins
6da74cc4e0 Merge "Add "heka-elasticsearch.toml" to /etc/heka in heka bootstrap container." 2016-03-08 14:05:15 +00:00
Jenkins
78c7bea33b Merge "Glance registry should only be accessible from internal network" 2016-03-08 14:05:08 +00:00
Rodolfo Alonso
c4febaf918 Add "heka-elasticsearch.toml" to /etc/heka in heka bootstrap container.
Missing file during the config procces of bootstrap container.

Change-Id: I600c0ca9c60bddae16310be1fcb65f3be482a599
Closes-Bug: #1554449
2016-03-08 10:02:03 +00:00
Dave McCowan
3b378b11ed Glance registry should only be accessible from internal network
When configured with a separate external VIP, glance registry
should listen on only the internal VIP.

TrivialFix

Change-Id: Ie186f2ea391b53b9ea0cb230c573c9e09efd44b2
2016-03-07 22:17:34 -05:00
Jenkins
4d0fb0b7f6 Merge "Use internalURL for internal communication" 2016-03-07 23:15:18 +00:00
Jenkins
eacaf76241 Merge "Move hostname registration to common" 2016-03-07 19:28:45 +00:00
Jenkins
7068d235e2 Merge "Upgrade fails from 2.0.0->2.0.1" 2016-03-07 18:04:03 +00:00
Steven Dake
1c26351925 Upgrade fails from 2.0.0->2.0.1
The new image doesn't have an existing old image, so it
ends up not existing.  In this condition, we know that
we are dealing with a version change upgrade.

TrivialFix

Change-Id: Ic2f83c2bb6c34731b60b3430ba66a6324439f0a9
2016-03-07 12:22:18 -05:00
Jenkins
5e547639b3 Merge "Fix "wait for log socket" in start.sh" 2016-03-07 16:15:43 +00:00
Dave McCowan
1c31951b85 Use internalURL for internal communication
When using separate networks for external APIs and internal
APIs, services need to be configured to use the internal APIs.
The default is typically publicURL.

TrivialFix

Change-Id: I24da63220a65e210c37d9f24b6d76a0031d66f3d
2016-03-07 09:28:48 -05:00
Éric Lemoine
14dec25e54 Fix "wait for log socket" in start.sh
The code in docker/base/start.sh that waits for the log socket does
not work because it includes a bad "space" character after "-S".

This patch changes that character to a real "space" character. It
also sets the SKIP_LOG_SETUP envvar for the Heka container.

TrivialFix

Change-Id: I17a3005df5bbd57678350fc77030e44b5ad6acae
2016-03-07 13:21:38 +01:00
Jenkins
5c8fb2b1dd Merge "Reconfigure horizon service" 2016-03-07 09:11:31 +00:00
Jenkins
962be007a4 Merge "Upgrade fails at Magnum" 2016-03-07 09:04:03 +00:00
Jenkins
8c3e5b2771 Merge "Make memcached reconfigure not block" 2016-03-07 09:03:43 +00:00
Jeffrey Zhang
d9418c09dc Reconfigure mongodb service
Implements reconfiguring the mongodb service.

Closes-Bug: #1553523
Change-Id: I0e2beb43dfbb24772ad07668df8c0ee1c3cefb46
2016-03-07 16:05:38 +08:00
Jeffrey Zhang
9a5150275b Reconfigure horizon service
Implements reconfiguring the horizon service.

Closes-Bug: #1553526

Change-Id: I8bb2398ebdf4b10fe8386f5b2b25802172e1cbd3
2016-03-07 11:42:27 +08:00
Jenkins
1e70714197 Merge "Reconfigure for Swift" 2016-03-06 15:19:11 +00:00
Steven Dake
355b6a4599 Upgrade fails at Magnum
Typo in magnum upgrade task

Change-Id: Ia3e206e10b24bae12857ea13becda55bc13f33fd
Closes-Bug: #1553643
2016-03-05 22:06:55 -05:00
Steven Dake
004880397a Make memcached reconfigure not block
The playbooks crash during reconfigure of memcached.

Change-Id: I737a71598a6a9747999cfcfbe78c70dbb6fdc608
Closes-Bug: #1553631
2016-03-05 21:22:38 -05:00
Jenkins
08101fd465 Merge "Make Heka send logs to Elasticsearch" 2016-03-05 15:36:44 +00:00
Serguei Bezverkhi
514da17605 Reconfigure for Swift
This implements reconfigure for Swift service. Fixes swift-rsyncd in
All-in-One deployment

Partially-Implements: blueprint kolla-reconfig

Change-Id: I82bfa3c73b7365bc3a0ea35d3fc102a3525ebd8c
2016-03-05 10:24:13 -05:00
Éric Lemoine
491aff0b88 Make Heka send logs to Elasticsearch
This patch includes changes relative to integrating Heka with
Elasticsearch and Kibana.

The main change is the addition of an Heka ElasticSearchOutput plugin
to make Heka send the logs it collects to Elasticsearch.

Since Logstash is not used the enable_elk deploy variable is renamed
to enable_central_logging.

If enable_central_logging is false then Elasticsearch and Kibana are
not started, and Heka won't attempt to send logs to Elasticsearch.

By default enable_central_logging is set to false. If
enable_central_logging is set to true after deployment then the Heka
container needs to be recreated (for Heka to get the new
configuration).

The Kibana configuration used property names that are deprecated in
Kibana 4.2. This is changed to use non-deprecated property names.

Previously logs read from files and from Syslog had a different Type
in Heka. This is changed to always use "log" for the Type. In this
way just one index instead of two is used in Elasticsearch, making
things easier to the user on the visualization side.

The HAProxy configuration is changed to add entries for Kibana.
Kibana server is now accessible via the internal VIP, and also via
the external VIP if there's one configured.

The HAProxy configuration is changed to add an entry for
Elasticsearch. So Elasticsearch is now accessible via the internal
VIP. Heka uses that channel for communicating with Elasticsearch.

Note that currently the Heka logs include "Plugin
elasticsearch_output" errors when Heka starts. This occurs when Heka
starts processing logs while Elasticsearch is not yet started. These
are transient errors that go away when Elasticsearch is ready. And
with buffering enabled on the ElasticSearchOuput plugin logs will be
buffered and then retransmitted when Elasticsearch is ready.

Change-Id: I6ff7a4f0ad04c4c666e174693a35ff49914280bb
Implements: blueprint central-logging-service
2016-03-05 11:51:49 +01:00
Jenkins
32ce37cb8f Merge "Fix horizon with ssl" 2016-03-04 23:17:52 +00:00
Jenkins
e45781cf25 Merge "Reconfigure ceph service" 2016-03-04 22:35:45 +00:00
Jenkins
9cc5def5f6 Merge "Reconfigure for Murano" 2016-03-04 18:37:13 +00:00
Jenkins
6daf6eb0cd Merge "Add authentication for keepalived" 2016-03-04 18:15:04 +00:00
Vikram Hosakote
efd1099335 Reconfigure ceph service
This patch set implements reconfiguring the ceph service.

Change-Id: I904d5e4b33c82e20a8e7e84308b62573f59de714
Partially-implements: bp kolla-reconfig
2016-03-04 18:06:50 +00:00
Jenkins
e9eb2f44ca Merge "Playbook for Manila upgrade" 2016-03-04 17:58:29 +00:00
Jenkins
92d5b3e5e0 Merge "Fix Keystone v3 for Manila" 2016-03-04 17:57:09 +00:00
Jenkins
3c015ad207 Merge "Reconfigure for Memcached" 2016-03-04 17:55:12 +00:00
MD NADEEM
20f080223f Reconfigure for Murano
Add reconfiguration for murano-api, murano-engine

Change-Id: I8a2b1b1cc2b6268d6d1f07b1dfcb96ba9f7fd7a0
Partially-Implements: blueprint kolla-reconfig
2016-03-04 17:33:50 +00:00
Jenkins
82c426ce3a Merge "Set mongodb log file to shared volume by heka" 2016-03-04 17:01:24 +00:00
Mauricio Lima
93df1da8dd Fix Keystone v3 for Manila
TrivialFix

Change-Id: I05bc0c95533372af11575f345e64d6f57ef9c157
2016-03-04 11:29:00 -05:00
Mauricio Lima
4d0a3328f3 Playbook for Manila upgrade
Co-Authored-By: Michal Rostecki <mrostecki@mirantis.com>
Change-Id: Iceed173c3c3abea93b954f8d3cb45641de2aaa0f
Partially-Implements: blueprint upgrade-kolla
Implements: blueprint upgrade-manila
2016-03-04 11:22:03 -05:00
Jenkins
2d22570a02 Merge "Use use_forwarded_for in manila config" 2016-03-04 16:10:13 +00:00
Hui Kang
ef24d9e597 Set mongodb log file to shared volume by heka
TrivialFix

Change-Id: I085ef2884749bb4ecc546b78052a5688e8b36ad3
2016-03-04 11:04:23 -05:00
Jenkins
9fcd3122cd Merge "Playbook for Ironic upgrade" 2016-03-04 16:01:29 +00:00
Jenkins
e72c8f1147 Merge "Playbook for magnum upgrade" 2016-03-04 15:53:23 +00:00
Jenkins
91f3bb0395 Merge "Reconfigure for Swift" 2016-03-04 15:44:41 +00:00
Jenkins
356af48625 Merge "Reconfigure nova service" 2016-03-04 15:03:31 +00:00
SamYaple
dd8e1cb2ee Fix horizon with ssl
Ubuntu did not have mod_headers enabled by default

Remove unused variable and adjust 'when' conditional positioning

TrivialFix

Change-Id: I82b8724526c24f4481a80165520d624f6a02c336
2016-03-04 14:51:50 +00:00
Jenkins
7ab6def355 Merge "Add reconfigure for heka" 2016-03-04 14:36:47 +00:00
Éric Lemoine
7a9257b482 Use use_forwarded_for in manila config
In https://review.openstack.org/#/c/286876 the use_forwarded_for
option was removed from the Manila configuration. Manila does support
that option so it should be kept for logs to include the appropriate
clien IP address.

TrivialFix

Change-Id: I0279ad24a2331ce7e6e292549013b9553fe1a6f3
Related-Bug: #1548935
2016-03-04 15:34:42 +01:00
Michal Rostecki
50aafb8645 Playbook for magnum upgrade
Change-Id: I5607d1a21d1eb4e4aaf83b0a09e3f50650f76fdb
Partially-Implements: blueprint upgrade-kolla
Implements: blueprint upgrade-magnum
2016-03-04 15:32:54 +01:00
Jenkins
b5ffb450e6 Merge "Reconfigure Ironic" 2016-03-04 14:31:24 +00:00
Jenkins
7f9ba5a477 Merge "Reconfigure cinder service" 2016-03-04 14:28:39 +00:00
Jeffrey Zhang
e6b230d784 Add authentication for keepalived
TrivialFix

Closes-Bug: #1551314
Change-Id: Id85859500aec283703b6b6714abf213a42286182
2016-03-04 21:28:01 +08:00