10095 Commits

Author SHA1 Message Date
Zuul
0cbebc4786 Merge "Fix the redis_connection_string for osprofiler and make it generic" 2019-06-24 13:08:21 +00:00
Zuul
4fb6c2d90f Merge "Add some notes for users Migrating to Kolla Monasca" 2019-06-24 13:08:20 +00:00
Zuul
8622d6fcc6 Merge "CI - remove unnecessary logic when building images for upgrade" 2019-06-24 13:08:18 +00:00
Zuul
4303de142c Merge "Implement Apache WSGI for Qinling" 2019-06-24 11:30:59 +00:00
Zuul
d16b68fc1d Merge "Designate - remove obsolete task" 2019-06-24 11:08:44 +00:00
Radosław Piliszek
957f6dd453 Designate - remove obsolete task
"Check if policies shall be overwritten" already exists in its
newer form. The removed one had no effect on play.

Change-Id: I48ed6c1c71c4162a3ab28ab2b51dc1e02932dfef
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
2019-06-21 21:21:15 +02:00
ZijianGuo
d7c4a4f2b9 Replace merge_configs with merge_yaml for merge mongodb.conf
Actually, 'mongodb.conf' is a yaml format configuration file. Do not use
merge_configs to merge it.

Change-Id: Id3c006df00c1e2d66472c2195781e01c640cab22
Signed-off-by: ZijianGuo <guozijn@gmail.com>
2019-06-21 22:40:25 +08:00
Gaëtan Trellu
f867c471fb Implement Apache WSGI for Qinling
Since this review[1], Qinling supports WSGI execution.

From a production perspective, Qinling should be deployed
using Apache and mod_wsgi.

"api_worker" option is not needed anymore because processes will
be handle by Apache mod_wsgi.

Qinling Docker image review[2] has ben created.

[1] https://review.opendev.org/661851
[2] https://review.opendev.org/666647

Change-Id: I9aaee4c2932f1e4ea9fe780a64e96a28fa6bccfb
Story: 2005920
Task: 34181
2019-06-21 09:46:02 -04:00
Radosław Piliszek
8ce5ffd0c2 CI - remove unnecessary logic when building images for upgrade
Docker registry being insecure is handled by docker_registry_insecure
which is set to true by default when docker_registry is set.
The removed code had no effect because docker_registry is not changed
anyway for base (pre-upgrade) install.

This change makes config more readable and also prevents a potential
conflict with the zun profile if ever used in upgrade mode.

Change-Id: I9b5ae8c5b534fa6cce9dbaca8af191e2ca79d19f
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
2019-06-21 11:31:30 +00:00
Doug Szumski
c4f488adcf Add some notes for users Migrating to Kolla Monasca
This commit should help guide people migrating to Kolla Monasca
through the murky depths of the migration process. Since Kolla
did not support Monasca in Queens, some of these steps which
could be automated are not.

Change-Id: I79051cca27178c3cf1671f5c603e38baf929c55c
2019-06-20 17:30:29 +01:00
Zuul
bc7dea58c2 Merge "Ingest non-standard Monasca logs" 2019-06-20 10:03:11 +00:00
Gaëtan Trellu
b1c28e95b0 Fix Qinling deployment and reconfigure
The "environment" variable set in config.yml and handlers/main.yml
has been removed to fix de deployment and the reconfigure.

Change-Id: I912cadb5113d5572235731863825588b2eb12759
2019-06-19 16:16:19 -04:00
Zuul
8ce545e7b8 Merge "Fix default deployment of freezer, use mariadb." 2019-06-19 13:59:53 +00:00
Zuul
84caa99674 Merge "Add logrotate configuration for horizon" 2019-06-19 12:08:58 +00:00
Zuul
23c27ed8bb Merge "Make Ceph upgrade check Ceph release to avoid EPERM" 2019-06-19 09:56:58 +00:00
Zuul
16186537a6 Merge "Remove heat_watch_server_url configuration option" 2019-06-19 04:39:32 +00:00
Tatsuma Matsuki
1d02ec49f6 Add logrotate configuration for horizon
Change-Id: I97263385372a28204c0ae81373836a2d6292f3bd
Closes-Bug: #1833336
2019-06-19 13:33:34 +09:00
Marek Svensson
10bf6b05fa Fix default deployment of freezer, use mariadb.
This change defaults freezer to use mariadb as default backend for database
and adds elasticsearch as an optional backend due to the requirement of
freezer to use elasticsearch version 2.3.0. The default elasticsearch in
kolla-ansible is 5.6.x and that doesn't work with freezer.

Added needed options to the elasticsearch backend like:
 - protocol
 - address
 - port
 - number of replicas

Change-Id: I88616c285bdb297fd1f738846ddffe1b08a7a827
Signed-off-by: Marek Svensson <marek@marex.st>
2019-06-18 15:12:36 -04:00
Zuul
49c2f48916 Merge "Fix mongo command for supporting other port" 2019-06-18 17:40:02 +00:00
Zuul
0bd468004e Merge "Do not create Keystone domain-specific config directory if useless" 2019-06-18 17:02:08 +00:00
ZijianGuo
cd836dd39f Fix the redis_connection_string for osprofiler and make it generic
* When using redis as the backend of osprofiler, it cannot connect to
redis because the redis_connection_string is incorrect.

* Let other places that use redis also use this variable.

Change-Id: I14de6597932d05cd7f804a35c6764ba4ae9087cd
Closes-Bug: #1833200
Signed-off-by: ZijianGuo <guozijn@gmail.com>
2019-06-18 21:52:52 +08:00
Zuul
2fd984544d Merge "Comment out all variables in globals.yml" 2019-06-18 12:19:10 +00:00
Zuul
80f7926204 Merge "Make cron jobs generator command task in keystone non-changing" 2019-06-18 12:19:08 +00:00
Doug Szumski
4b31fdcf35 Ingest non-standard Monasca logs
Presently, errors can appear in Fluentd and Monasca Log API logs due
to log output from some Monasca services, which do not use Oslo log,
being processed alongside other OpenStack logs which do.

This change parses these log files separately to prevent these errors.

Change-Id: Ie3cbb51424989b01727b5ebaaeba032767073462
2019-06-18 12:14:58 +01:00
Radosław Piliszek
0ea991e4d2 Make Ceph upgrade check Ceph release to avoid EPERM
Since we have different upgrade paths, we must use the actually
installed Ceph release name when doing require-osd-release

Closes-Bug: #1832989

Change-Id: I6aaa4b4ac0fb739f7ad885c13f55b6db969996a2
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
2019-06-18 11:35:43 +02:00
Zuul
f1deb7467c Merge "Fix placement log perms in config.json" 2019-06-17 17:48:54 +00:00
Radosław Piliszek
802dfce4a8 Make cron jobs generator command task in keystone non-changing
The task does not change any state but is used to set a fact
from parsed output.

Also adjust task name.

Change-Id: I5fe322546d82a373522645485be18fe7bfc57999
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
2019-06-17 18:55:51 +02:00
Zuul
6cae4dedfe Merge "Remove nova-consoleauth" 2019-06-17 16:28:45 +00:00
Xing Zhang
f7bfce20ad
Fix mongo command for supporting other port
If we change mongodb_port, the command for bootstraping mongodb
should not connect to the default mongodb port 27017.

Change-Id: I330999be577d6416df162ea33fa1f7a19df56029
2019-06-16 18:32:24 +08:00
Radosław Piliszek
16e58a463a Comment out all variables in globals.yml
To be consistent.

Also fix surrounding comments.

Change-Id: Id1a65ab3379ca76192e9291f941b9b675a05ff09
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
2019-06-16 10:53:58 +02:00
Jeffrey Zhang
4e032923c0 Remove nova-consoleauth
The nova-consoleauth service was deprecated during the Rocky release [1]
and has not been necessary since unless you're using cells v1. As Kolla
has never supported cells v1, which is finally being removed during
Train [2], we can get ahead of the curve and stop deploying
nova-consoleauth immediately.

[1] https://specs.openstack.org/openstack/nova-specs/specs/rocky/implemented/convert-consoles-to-objects.html
[2] https://blueprints.launchpad.net/nova/+spec/remove-cells-v1/

Change-Id: I099080979f5497537e390f531005a517ab12aa7a
2019-06-16 16:39:07 +08:00
Radosław Piliszek
5729af8ab7 Do not create Keystone domain-specific config directory if useless
The task was duplicated below (and this other one is conditional).
Additionally fix related tasks names.

Change-Id: I76a6dd84e78277f87b04951eb4e75bbdfc1c38bf
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
2019-06-14 18:07:42 +02:00
Zuul
cb0cb441c2 Merge "Update service_provider for FWaaS v2" 2019-06-13 19:24:21 +00:00
Zuul
f7c0e3cdbe Merge "Remove obsolete roles middleware" 2019-06-13 19:24:20 +00:00
Zuul
64c31d1552 Merge "Remove ceilometer transformers config" 2019-06-13 19:24:18 +00:00
Zuul
f0e5f76c64 Merge "Elevate privileges for copying gnocchi policy.json" 2019-06-13 19:24:17 +00:00
Zuul
297cade18c Merge "Fixes VMTP deploys." 2019-06-13 19:24:15 +00:00
Zuul
9c342241f7 Merge "Fix mongo command for checking replication status" 2019-06-13 19:24:14 +00:00
Zuul
922a262345 Merge "Fix issues obtaining Keystone token with Monasca Grafana" 2019-06-13 19:15:43 +00:00
Zuul
29b755eb15 Merge "Remove Neutron LBaaS support" 2019-06-13 19:15:42 +00:00
Zuul
bc117137e6 Merge "Add support for idempotent container stop and removal" 2019-06-13 19:15:40 +00:00
Zuul
b24c3d3b54 Merge "Add load monitoring plugin config for Monasca" 2019-06-13 19:15:39 +00:00
Zuul
ede5f41be3 Merge "Supporting monitoring time synchronisation with Monasca" 2019-06-13 18:58:33 +00:00
Zuul
2af1df6c99 Merge "Fix issue finding custom, host specific plugins" 2019-06-13 18:58:32 +00:00
Zuul
ee895413eb Merge "Stop duplicating Nova cells" 2019-06-13 18:56:00 +00:00
Pierre Riteau
cc011ceb41 Remove heat_watch_server_url configuration option
The AWS-compatible CloudWatch API has been removed from Heat in Queens.
Remove its configuration option from the heat.conf template.

Change-Id: If6f7dd28bbb75308ef434c166c28a5cf4a624cbd
2019-06-13 17:58:46 +01:00
Michal Nasiadka
b850eeec9c Fix placement log perms in config.json
Currently placement-api is configured to log to
/var/log/kolla/placement/placement-api.log, but config.json is changing
permissions of /var/log/kolla/placement/placement.log - this patch
changes this.

Change-Id: I7f1591bdbc7c03302befc3ca6ebf1b13c95640c2
2019-06-13 08:22:21 +00:00
Zuul
806e6be181 Merge "Set log message field name in Monasca Fluentd plugin" 2019-06-11 12:43:41 +00:00
Zuul
860f4ea605 Merge "Include cron_generator script in coverage report" 2019-06-11 08:05:40 +00:00
ZijianGuo
08f5c50e74 Fix mongo command for checking replication status
By default, the mongo command connection address is '127.0.0.1:27017'.
If we change mongodb_port, It cause the handle 'Checking current
replication status' always connect to '127.0.0.1:27017'. So we need
add options like '--host' and '--port'.

Change-Id: I172ef3d19ff2bea97db3a5207c1a984cd188ceba
Signed-off-by: ZijianGuo <guozijn@gmail.com>
2019-06-10 10:58:51 +08:00