3157 Commits

Author SHA1 Message Date
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
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
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
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
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
Jeffrey Zhang
2352f99863 Add default volume_backend_name for rbd driver in cinder volume
volume_backend_name is required when using volume type.

Change-Id: Idab2ab98dea4940ba9404b219dbed935db0d51ed
Closes-Bug: #1705657
2017-07-21 16:25:07 +08:00
Jenkins
ffc4fb3793 Merge "Make Ironic inspector honour inventory" 2017-07-20 13:44:50 +00:00
Jenkins
6ef30ca452 Merge "Add dev mode for Murano" 2017-07-20 11:27:51 +00:00
Flavio Percoco
bbe9d418ba Allow for running standalone Ironic w/o keystone
The Ironic templates and roles assume Keystone is enabled and they don't
make use of the `enable_keystone var. This patch changes the behavior so
that `noauth` is used as auth method for Ironic if keystone is not
enabled, the Ironic endpoint is not registered if keystone is not
enabled and the keystone section is not created in the config file.

Change-Id: I813de42d10ac264eec81076cb107b58af09ff686
2017-07-19 13:32:11 +02:00
Jenkins
0cd868243f Merge "Disable trace for all containers running httpd" 2017-07-19 08:09:06 +00:00
Eduardo Gonzalez
d4e7dfb376 Finish/fix neutron sfc service
Neutron-sfc-agent start its functions with openvswitch.
This change moves sfc configuration into neutron-openvswitch-agent.

Rework config files to use openvswitch when sfc or openvswitch
are used as network plugin.

Also adds sfc extension_driver to ml2

Change-Id: If1ebf9554f6d686cc6d064e698a48f8a6b6172b3
Closes-Bug: #1664493
Depends-On: I60ba1333231a4ae38a041d41e551f7d74fe15e3b
2017-07-19 09:06:24 +01:00
Jenkins
f28863d547 Merge "Revert "Add default_boot_option configuration"" 2017-07-19 08:02:19 +00:00
Mark Goddard
922eb494e6 Make Ironic inspector honour inventory
Ironic inspector should honour the Ansible inventory group
ironic-inspector. Ironic inspector may not be required at all. If
Ironic inspector is required then it should only run on a single
node, and this should be reflected by the inventory.

This change makes a number of Ironic inspector-related tasks dependent
upon the host's membership of the ironic-inspector group. Also, we
couple the ironic-dnsmasq container with the ironic-inspector group
rather than ironic-conductor, as the service is for inspector rather
than Ironic.

Change-Id: Ifd90753b0fe1a55c11b7723c28e1d14ab3d32737
Closes-Bug: #1665257
2017-07-19 08:24:21 +01:00
Jenkins
eab8efe166 Merge "Magnum: Enable cluster trust customization" 2017-07-19 05:43:43 +00:00
Jenkins
66ed21b991 Merge "Make ceph default cinder backup driver again" 2017-07-19 03:55:12 +00:00
Jenkins
8df4d59593 Merge "Restart lbaas agent when lbaas conf changed" 2017-07-19 03:26:57 +00:00
Jenkins
f50efca182 Merge "Update cinder sanity check to use built in shade" 2017-07-19 03:24:38 +00:00
Jenkins
d079951252 Merge "Remove all kolla-kubernetes configurations" 2017-07-19 03:23:51 +00:00
Jenkins
7333ae330f Merge "Upgrade from docker-py to docker" 2017-07-19 03:19:33 +00:00
Jeffrey Zhang
f5dd178fc5 Disable trace for all containers running httpd
Trace method is enabled in default for httpd. There is security risk
with trace enabled. So disable it in default. more info please check[0].

[0] https://security.stackexchange.com/a/7711

Change-Id: I4496a6d058d88e1abfb210085f189e7a610e0362
Closes-Bug: #1705160
2017-07-19 10:52:41 +08:00
Jenkins
4d38340623 Merge "Support cinder backend for glance" 2017-07-18 15:41:23 +00:00
Mark Goddard
1ab0b7adf1 Revert "Add default_boot_option configuration"
This reverts commit 898155dfd294371f361f0563a2c4ee1325487507.

The default value of the ironic configuration option default_boot_option
will eventually change from netboot to local. The netboot option is
incompatible with multitenancy in ironic, as it requires a PXE
environment in the tenant network, so it was no longer deemed a suitable
default value.

Ironic added a warning message when this option is not explicitly set,
presumably to alert operators to the change. The commit being reverted
set the option to 'netboot'. This will cause operators to continue to
use the netboot option even after the default value changes, which was
presumably not the intention of the ironic team in changing the default
value. It also hides the warning message from the operator that could
alert them to the fact that this default is changing.

Change-Id: I0ebb1d5ffbead50b034488337e6c93a2f48aaf69
Related-Bug: #1696636
2017-07-18 16:40:16 +01:00
Jenkins
5e04b31175 Merge "Remove ceilometer-api and ceilometer-collector services" 2017-07-18 14:20:58 +00:00
Jeffrey Zhang
cacf08f0a6 Remove all kolla-kubernetes configurations
kolla-kubernetes is using its own configuration generation[0], so it is
time for kolla-ansible to remove the related code to simplify the
logical.

[0] https://github.com/openstack/kolla-kubernetes/tree/master/ansible

Change-Id: I7bb0b7fe3b8eea906613e936d5e9d19f4f2e80bb
Implements: blueprint clean-k8s-config
2017-07-18 22:00:58 +08:00
Jeffrey Zhang
d1d726e937 Add pipeline file into ceilometer-central and ceilomter-compute node
Closes-Bug: #1704915
Change-Id: If85cd7bc8547494900c8f6c32dfd1c1f2179f928
2017-07-18 11:45:02 +08:00
Jenkins
a17315e39b Merge "Move nova scheduler related parameters to [scheduler] group" 2017-07-18 01:43:38 +00:00
shaofeng_cheng
6c58d554de Restart lbaas agent when lbaas conf changed
Neutron-lbaas-agent container is not restart when neutron_lbaas.conf changed.

Closes-Bug: #1704900

Change-Id: Ie9babdf5ad0875b604cb1728a116b450e0f89858
2017-07-18 09:35:19 +08:00
shaofeng_cheng
4eda91e229 Add fwaas support to vsphere by vmware-nsx plugin
Add fwaas support to vsphere by vmware-nsx plugin in neutron.

Change-Id: Ie80830f97701d322a3610815f6abd63c523a96d4
Partially-implements: blueprint kolla-ansible-support-vsphere
2017-07-17 17:57:43 +08:00
Eduardo Gonzalez
f2c54e6121 Make ceph default cinder backup driver again
Ceph was default backup driver in ceph.
Before this change [0] ceph backup was enabled
when ceph was enabled, but now uses
cinder_backup_driver which defaults to NFS.
This will cause users upgrading from ocata
loose their backup functionallity.

[0] a7c47a0539

Change-Id: I44ef59291c90289abfb8c05726540893ae029d23
2017-07-17 11:15:54 +02:00
Jenkins
8c92888657 Merge "Add VMware DataStore support to cinder" 2017-07-17 08:57:49 +00:00
Jenkins
413bd848f2 Merge "Fix wsgi file path and log-file parameter" 2017-07-17 08:21:54 +00:00
Jenkins
aa64cd384e Merge "delete delimiter from init fernet condition check" 2017-07-17 08:18:16 +00:00
Jeffrey Zhang
ddad15c07e Remove ceilometer-api and ceilometer-collector services
* remove ceilometer-api and ceilometer-collector service
* use ceilometer-notification to publish message to proper backend
* remove useless ceilometer_database_type and ceilometer_event_type
  variables
* sync event_definitions.yaml, event_pipeline.yaml and pipeline.yaml
  file with upstream

Change-Id: Ib39053cb5f70bd11ee61d3f26d5b28accecd7190
2017-07-17 11:03:44 +08:00
Jeffrey Zhang
65ebba8b1d Fix wsgi file path and log-file parameter
* use gnocchi-api script for wsgi based on this commit[0].
* logfile is deprecated. Use log-file instead[1].

[0] c8717e8b71
[1] https://github.com/gnocchixyz/gnocchi/blob/master/gnocchi/opts.py#L77,L82

Change-Id: I8fbe8425e43d82e0f9601ba6303dd7f24142a2e6
2017-07-17 10:02:28 +08:00
Bertrand Lallau
2d424ffb14 Remove warning during kolla_docker execution
Ansible check if modules parameters are named like
%password% and allow to hidden log param in this case.
This requires adding "no_log" parameters.
This patch just add "no_log" param in order to avoid
this warning.

Change-Id: I9c1df1093e0fd101090292d6e8bf3527f99aeb17
Closes-Bug: #1702244
2017-07-14 18:43:45 +02:00
Jenkins
41475bdc7b Merge "Fix searchlight nova resources indexation" 2017-07-14 13:25:17 +00:00
Jenkins
d6d0e7d44b Merge "Searchlight: activate Ironic resources" 2017-07-14 13:24:37 +00:00
Jenkins
d5c6689629 Merge "Fix fwaas options" 2017-07-14 13:17:42 +00:00
Jenkins
00e3d2f805 Merge "Pull cinder cephx keyring only when enable_cinder is true in nova" 2017-07-14 13:11:10 +00:00