7567 Commits

Author SHA1 Message Date
Jenkins
e9c4a5877d Merge "Use a separate user for ceph-rgw rather than keystone admin user" 5.0.0.0b3 2017-07-27 14:47:08 +00:00
Jenkins
6c144946fa Merge "Only start one glance_api when using file backend" 2017-07-27 09:41:44 +00:00
Jenkins
06046f3943 Merge "Unified Apache access log format" 2017-07-27 09:30:53 +00:00
Jeffrey Zhang
1cf116cd6c Use a separate user for ceph-rgw rather than keystone admin user
If not, change admin user password will break ceph rgw service.

Change-Id: Ia872f6f1aa2d9917d3f5851e0edcffed61e71355
Closes-Bug: #1705929
2017-07-27 16:41:41 +08:00
Jenkins
d44d5d0b48 Merge "Support multi local chrony servers" 2017-07-27 08:25:31 +00:00
Jenkins
815dfe40f6 Merge "Add qdrouterd role for messaging infrastructure component" 2017-07-27 08:23:31 +00:00
Jenkins
2f809c15b0 Merge "ntpd behind proxy fails" 2017-07-27 08:00:20 +00:00
Jenkins
960c8de70b Merge "Updated from global requirements" 2017-07-27 07:57:30 +00:00
Jenkins
fe0f9aa198 Merge "Add vmware DVS support to kolla-ansible" 2017-07-27 05:58:53 +00:00
OpenStack Proposal Bot
96e8ab2042 Updated from global requirements
Change-Id: Ic043dcac9d9483374fbdac7287d686ba4a72fc6b
2017-07-27 05:23:28 +00:00
Jenkins
71133abce7 Merge "Fix logging collection in gates" 2017-07-27 03:23:02 +00:00
Jenkins
54d87795d8 Merge "Fix zun command in zun-guide" 2017-07-27 03:13:59 +00:00
Jenkins
d3b481cc7d Merge "Fix configuration for nova_compute_ironic" 2017-07-26 21:04:46 +00:00
Jenkins
5c78a82ec5 Merge "Add Elasticsearch to Grafana" 2017-07-26 20:43:06 +00:00
Jenkins
d4b0c28bb6 Merge "Make cinder-backup service optional" 2017-07-26 20:22:23 +00:00
Eduardo Gonzalez
afe16ceadd Fix zun command in zun-guide
Zun command is invalid, double colons are not
valid.
More info about this in bug report.

Change-Id: I367aec97775dcefb2c45fe55a311c5451d33e703
Closes-bug: #1706569
2017-07-26 17:41:10 +02:00
Jenkins
5e9697d2fd Merge "Wait keystone_fernet running before init tokens" 2017-07-26 14:41:01 +00:00
Jenkins
f3956ee93b Merge "Fix zun transport_url" 2017-07-26 14:40:54 +00:00
Eduardo Gonzalez
ca82b29858 Wait keystone_fernet running before init tokens
Init fernet task fails if keystone_fernet container
is not running and ssh port bind.
This change add a check to ensure all keystone_fernet containers
are running before init fernet tokens.

Change-Id: Ib95bb5a47a9174f1a00b82cc8b697c0dc19c848e
Closes-Bug: #1704758
2017-07-26 10:52:59 +00:00
Jenkins
59309f74ff Merge "Remove Kafka from Infrastructure components list" 2017-07-26 10:49:02 +00:00
Yotaro Konishi
c1ed80fe84 Fix configuration for nova_compute_ironic
Currently nova.conf.j2 generates two compute_driver options for
nova_compute_ironic container like this:

compute_driver = ironic.IronicDriver
compute_driver = libvirt.LibvirtDriver

nova_compute_ironic container fails to start because the latter value
overrides the former one.

This patch fixes the issue recently introduced in [1].

[1] 63314ad6dd181a0e975438de2e99409238f1b775

Change-Id: Ibb661a5a594120be4195d331c38883c3b2886361
Closes-Bug: #1706534
2017-07-26 16:31:25 +09:00
Tatsuma Matsuki
db0f469614 Unified Apache access log format
Apache access log formats are modified to be consistent with
the format defined in wsgi-keystone.conf, which includes
the response time (%D) and X-forwarder-For fields.

Change-Id: I02aa5eb106fb894196dfb6e22daf2968e27ed3cb
Closes-Bug: #1703571
2017-07-26 04:11:54 +00:00
Jeffrey Zhang
72ee7dac7c Support multi local chrony servers
In the old implementation, if there is no external ntp server, only one
local chrony server is supported. If multi chrony-server is configured,
chrony client can not sync with them.

In the new implementation
* use VIP to connect chrony-server, which ensure multi local chrony
  servers are supported.
* chrony servers depend on VIP. So chrony-server group should be
  the same with haproxy group.
* prevent chrony client sync from itself.
* Change owner to chrony:kolla for chrony log folder
* fix keysfile path
* use chrony user for centos and ubuntu image
* fix permission issue for /var/lib/chrony folder

Closes-Bug: #1705200
Change-Id: I6e85fda9824b5ddc7a96895425c5932a3566c27e
2017-07-26 03:38:05 +00:00
Eduardo Gonzalez
6e8ff22515 Fix zun transport_url
Double dots were removed by mistake in previous changes.
This causes incorrect transport url.

Change-Id: Id3b28574d7f06cecc97ddfb26815a4758f6f065a
2017-07-26 00:18:08 +01:00
Jenkins
24c4e910e4 Merge "Fix zun-api logging and state_path" 2017-07-25 13:07:44 +00:00
Paul Bourke
4fde486dc8 Only start one glance_api when using file backend
The default backend storage for Glance in Kolla is file, as this is the
easiest to deploy. However, this leads to frustration in a multinode
scenario as the volumes aren't shared.

This change sets glance_api to only start on one control node when using
the file backend.

DocImpact
Closes-Bug: #1681301
Change-Id: I2c167bae6f34a102cd7fe66401d7defe13bf2bf7
2017-07-25 11:17:58 +01:00
Mathias Ewald
f4e7b3af7f Add Elasticsearch to Grafana
This patch adds Elasticsearch to Grafana as a data source

Change-Id: I7c6452bba47274f9d971b8000e9d3e911617874d
2017-07-25 09:18:12 +00:00
Pavel Glushchak
0f70b3883d Make cinder-backup service optional
Introduced new option enable_cinder_backup, that controls
whether to deploy cinder-backup service.

Change-Id: Ibb0ca0a478748d4caba4df434456ead0df95ffca
Signed-off-by: Pavel Glushchak <pglushchak@virtuozzo.com>
2017-07-25 11:04:39 +03:00
Jenkins
98ec9eb724 Merge "Remove an unnecessary endif" 2017-07-25 03:11:13 +00:00
Jenkins
d215bfecf8 Merge "Added note" 2017-07-25 03:08:11 +00:00
Yotaro Konishi
133423a3fc Remove an unnecessary endif
This patch fixes Jinja2 syntax error in ironic.conf.j2.

All kolla-kubernetes configurations was recently removed by [1], but the
commit overlooked to remove a '{% endif %}' statement in ironic.conf.j2.

[1] cacf08f0a6d009301f28c6723f399fb8c1daf267

Change-Id: I115fedfd026f14409b62f9552ff401956909f8a8
Closes-Bug: #1706230
2017-07-25 09:59:10 +09:00
Jenkins
3e747309bd Merge "Improve Swift ring setup sample script" 2017-07-24 21:25:54 +00:00
James Benson
52bbb65ed3 Added note
Closes-Bug: #1705116

Change-Id: I973b31c9fdba3158810481385ada1be5543144b2
2017-07-24 14:57:48 +00:00
Eduardo Gonzalez
52f73f4061 Fix logging collection in gates
Log retrieval was out of sync since repo split
and from multinode gates.

Many useful information retrieved before like
ps, df, docker info, etc is not in kolla-ansible
gates.

Also, his change fix logs visualization to have
colored view, allowing to easily identify errors.

Change-Id: I948233e26ceb6efc58b962bcb4b710b3f006232b
2017-07-24 14:32:09 +00:00
Jenkins
ca5c48bd2f Merge "Fix grafana post-config check" 2017-07-24 12:19:30 +00:00
Mathias Ewald
fa52fb3514 Fix grafana post-config check
Check grafana's /login url for status code 200 instead of root url since the
latter does not return an http 200 code

Change-Id: Ide7da26c0e217a4a60ad3d2ac693d6f7ac7bb722
Closes-Bug: #1705911
2017-07-24 11:13:22 +00:00
Jenkins
cd20a68635 Merge "Remove warning during kolla_docker execution" 2017-07-24 10:42:00 +00:00
Jenkins
c18fc54bcc Merge "Optimize reconfiguration for mariadb" 2017-07-24 08:57:19 +00:00
Jenkins
f0c6629723 Merge "Dynamically retrieve the location of ARA to work on both py2 & py3" 2017-07-24 08:11:34 +00:00
guochao
70ca560322 Add vmware DVS support to kolla-ansible
Openstack is able to simply manage VLAN network on VMware
Distributed Switch.
DHCP agent can provide dhcp offer with vlan tag provided
by OVS.
Both neutron external nic and physical nic of vCenter/
vSphere should be on a vlan trunk port and can communicate
with each other.

Depends-On: I4655086a3f058ec769d3d37ec6a19565b5ea0841
Change-Id: I6d1629e93f0efeddd2a9000f66cc6f714bebb07c
Partially-implements: blueprint kolla-ansible-support-vsphere
2017-07-24 05:42:14 +00:00
Jenkins
fee73e3598 Merge "Add cinder client keyring requirements for external ceph in nova" 2017-07-23 15:40:39 +00:00
David Moreau-Simard
77f1812e00 Dynamically retrieve the location of ARA to work on both py2 & py3
Remove the hardcoded callback path with python2.7 and use the
virtualenv python to determine the path where ARA is installed so
that no matter if we're running py2 or py3, it will work.

Change-Id: Ica0b94aeebabaeca8416a9768fadd12d3925e7b2
2017-07-22 23:13:16 -04:00
James Benson
8e1940d47a ntpd behind proxy fails
Change-Id: I0447e90f53f9b04315bc4e6618e528351521e05d
Closes-Bug: #1705558
2017-07-23 03:09:00 +00:00
Jenkins
23ac09c955 Merge "Add dev mode for Horizon" 2017-07-23 02:53:19 +00:00
Jenkins
64497cc3e6 Merge "Finish/fix neutron sfc service" 2017-07-22 12:33:19 +00:00
caoyuan
5cd55bf236 Optimize reconfiguration for mariadb
Change-Id: I278609f9832955849bc9381120a1b260f5a03f1b
Partially-implements: blueprint better-reconfigure
2017-07-22 08:50:08 +08:00
Jenkins
c993e8d349 Merge "Update the documentation link for doc migration" 2017-07-21 11:06:34 +00:00
chenxing
b39da1e4c2 Update the documentation link for doc migration
Change-Id: I8c340cfe33789badb4f8df93f0c13f56fdea5dbf
2017-07-21 09:49:19 +00:00
Mathias Ewald
b7aef07d28 Fix grafana data source registration
Make data source creation more dynamic to support a variable number of data
source of different types

Only create data sources actually deployed by kolla

Change-Id: I26a2d3c71b178562b906623ab77eaff673c81dce
2017-07-21 09:35:55 +00:00
Jenkins
ffc4fb3793 Merge "Make Ironic inspector honour inventory" 2017-07-20 13:44:50 +00:00