5338 Commits

Author SHA1 Message Date
James Kirsch
a158432223 Fix etcd protocol configuration
The etcd service protocol is currently configured with internal_protocol.
The etcd service is not load balanced by a HAProxy container, so
there is no proxy layer to do TLS termination when internal_protocol
is configured to be "https".

Until the etcd service is configured to deploy with native TLS
termination, the etcd uses should be independent of
internal_protocol, and "http" by default.

Change-Id: I730c02331514244e44004aa06e9399c01264c65d
Closes-Bug: 1884137
2020-06-27 07:37:36 +00:00
Zuul
e2acee87ee Merge "Clean up the unnecessary "" for include_tasks" 2020-06-17 20:27:49 +00:00
Zuul
e2e77ccf01 Merge "Switch octavia to use service project in service_auth" 2020-06-17 17:46:27 +00:00
Zuul
99936f1215 Merge "Remove max count from Cinder online schema migration" 2020-06-17 17:30:32 +00:00
Zuul
bfc2a5719c Merge "Fix issues with Prometheus config generation" 2020-06-17 16:56:43 +00:00
Zuul
fc92f11068 Merge "Fix STATIC_ROOT for Debian, Ubuntu" 2020-06-17 14:17:37 +00:00
Zuul
1e35ef5a26 Merge "Replace internal and external VIP CA with root CA" 2020-06-16 16:01:25 +00:00
gugug
f220970d46 Clean up the unnecessary "" for include_tasks
The double quotation is not necessary for include_tasks, this
ps to cleanup it.

Change-Id: I0701035d185fdf19286cced7fe51fc277511e4c1
2020-06-16 23:36:42 +08:00
Xing Zhang
c2037885e7 Switch octavia to use service project in service_auth
Recently a patch [1] was merged to stop adding the octavia user to the
admin project, and remove it on upgrade. However, the octavia
configuration was not updated to use the service project, causing load
balancer creation to fail.

There is also an issue for existing deployments in simply switching to
the service project. While existing load balancers appear to continue to
work, creating new load balancers fails due to the security group
belonging to the admin project. At a minimum, the deployer needs to
create a security group in the service project, and update
'octavia_amp_secgroup_list' to match its ID. Ideally the flavor and
network would also be recreated in the service project, although this
does not seem to impact operation and will result in downtime for
existing Amphorae.

This change adds a new variable, 'octavia_service_auth_project', that
can be used to set the project. The default in Ussuri is 'service',
switching to the new behaviour. For backports of this patch it should be
switched to 'admin' to maintain compatibility.

If a deployer sets 'octavia_service_auth_project' to 'admin', the
octavia user will be assigned the admin role in the admin project, as
was done previously.

Closes-Bug: #1882643
Related-Bug: #1873176

[1] https://review.opendev.org/720243/

Co-Authored-By: Mark Goddard <mark@stackhpc.com>

Change-Id: I1efd0154ebaee69373ae5bccd391ee9c68d09b30
2020-06-16 12:57:56 +01:00
Zuul
e7f39d31e9 Merge "Generate Root CA for Self-Signed Certificates" 2020-06-16 11:12:26 +00:00
James Kirsch
e3cd02eda4 Replace internal and external VIP CA with root CA
Replaced "kolla_external_fqdn_cacert" and "kolla_internal_fqdn_cacert" with
"kolla_admin_openrc_cacert". OS_CACERT is now set to the value of
"kolla_admin_openrc_cacert" in the generated admin-openrc.sh file.

Change-Id: If195d5402579cee9a14b91f63f5fde84eb84cccf
Partially-Implements: blueprint add-ssl-internal-network
Depends-On: https://review.opendev.org/#/c/731344/
2020-06-16 11:46:34 +01:00
Zuul
1f7a910b15 Merge "Remove chrony package if containerized chrony is enabled" 2020-06-15 18:48:06 +00:00
James Kirsch
a982d3acbb Generate Root CA for Self-Signed Certificates
Update the certificate generation task to create a root CA for the
self-signed certificates. The internal and external facing certificates
are then generated using the root CA.

Updated openstack_cacert to use system CA trust store in CI tests
certificate by default.

Change-Id: I6c2adff7d0128146cf086103ff6060b0dcefa37b
Partially-Implements: blueprint add-ssl-internal-network
2020-06-15 10:29:51 -07:00
Mark Goddard
55c0787d00 Remove max count from Cinder online schema migration
During an upgrade from Stein to Train, Kolla Ansible fails while running
TASK [cinder : Running Cinder online schema migration]

This is because the `--max_count 10` option is used, which returns 1
while migrations are processed. According to the upgrade documentation,
the command should be rerun while the exit status is 1:
https://docs.openstack.org/cinder/train/upgrade.html

This issue was introduced by a change to the image [1] which fixed a bug
in the way that the max count was interpreted, but exposed an issue in
using the max count.

This change fixes the issue by ceasing to pass MAX_NUMBER, which will
cause all migrations to occur in a single pass.

[1] https://review.opendev.org/#/c/712055

Change-Id: Ia786d037f5484f18294188639c956d4ed5ffbc2a
Closes-Bug: #1880753
2020-06-15 16:41:04 +00:00
Michal Arbet
3d747b7200 Remove chrony package if containerized chrony is enabled
This patch is removing chrony package
from docker host when containerized chrony is enabled.
It is also fixing issue with chrony container running
under Ubuntu docker host as noted below.

+ exec /usr/sbin/chronyd -d -f /etc/chrony/chrony.conf
2020-06-08T08:19:09Z chronyd version 3.4 starting (+CMDMON +NTP +REFCLOCK +RTC +PRIVDROP +SCFILTER +SIGND +ASYNCDNS +SECHASH +IPV6 -DEBUG)
2020-06-08T08:19:09Z Fatal error : Could not open configuration file /etc/chrony/chrony.conf : Permission denied

Added also removal apparmor profile for ubuntu when
containerized chrony is enabled, as chrony's package
is not removing apparmor profile, and therefore
containerized chrony is not working.

Change-Id: Icf3bbae38b9f5630b69d5c8cf6a8bee11786a836
Closes-Bug: #1882513
2020-06-15 13:06:36 +02:00
Radosław Piliszek
7bd8805004 Fix Grafana datasource update
Grafana changed the error message wording.
Match on the shortest sane string to play it safe.

Change-Id: Ic175ebdb1da6ef66047309ff07bcbba98fc67008
Closes-Bug: #1881890
2020-06-15 11:34:30 +02:00
Radosław Piliszek
d86f8ab9fe Fix issues with Prometheus config generation
related to newly introduced merge mechanism.
1) Per-host overrides cannot be run_once.
2) Since merge_yaml is silent about missing files, it ignored
   the fact that no proper file was given due to wrong variable
   being referenced (see the closed bug).

Change-Id: I6db4af4c6e3364838bdae510f300038b0c1560b0
Closes-Bug: #1882460
2020-06-15 10:41:57 +02:00
Zuul
03b6aaf3a7 Merge "fix deploy nova failed when use kolla_dev_mod" 2020-06-15 05:03:59 +00:00
wu.chunyang
40096b4868 fix deploy nova failed when use kolla_dev_mod
There's a logic error here, we call nova role from nova.yml file
under ansible folder. we should clone code before run
bootstrap_service task. if not, /opt/stack/nova which is empty
will mount to nova_api container.

Change-Id: Icc54c15080db9c2dc92709480e00b990e5a88662
2020-06-15 01:45:23 +00:00
gugug
2ebd62014e Remove nova-consoleauth task in U cycle
planned task removal

Change-Id: I613794667b8c08f524a69e7e3f447b2217efb3f7
2020-06-15 00:22:15 +00:00
Michal Arbet
f1addfa300 Fix group_vars and cinder template per documentation
When installing kolla with external ceph, ceph_cinder_user
var has to be set per documentation instead of ceph_cinder_volume_user.
This value is also rendered in example etc/kolla/globals.yml file.

This patch is fixing this bug or, let's say typo.

Change-Id: Id82b07867f4bc0e5d5e56363f0122014df6892bc
2020-06-11 22:37:44 +02:00
Zuul
4cb4481802 Merge "Support custom elasticsearch configuration files" 2020-06-11 09:19:15 +00:00
Zuul
f73f3e6d04 Merge "Add missing become to some VMWare tasks" 2020-06-10 18:30:03 +00:00
Christian Berendt
da64a36bc2 Support custom elasticsearch configuration files
Change-Id: Id43627c6b6d305d0efbdd27ac5a2efbd5bee9107
2020-06-10 14:50:25 +00:00
Zuul
4d84df8d7c Merge "Support customizing skydive.conf file" 2020-06-10 10:37:18 +00:00
Erol Guzoğlu
cb0715a04d Support customizing skydive.conf file
Provides mechanism to deploy custom skydive.conf files.

Change-Id: I3033b6268a2e955f3e86b1b7000db17c1bb18c47
2020-06-10 07:11:54 +00:00
Zuul
e74cada7c1 Merge "permission denied when enable_kolla_dev_mod" 2020-06-10 02:32:45 +00:00
Zuul
f27ec1a23d Merge "Remove the unnecessary task for octavia" 2020-06-09 20:27:58 +00:00
Zuul
0c58269bc1 Merge "Remove XenAPI integration" 2020-06-09 19:58:38 +00:00
gugug
a7c290765b Remove the unnecessary task for octavia
Since the Victoria released, the unnecessary task should be clean up.

Change-Id: Idd2a05ed0594dcca6fa9881dee63f5550cb6dc0e
2020-06-10 00:11:15 +08:00
Christian Berendt
60e03d7bf3 Remove XenAPI integration
Change-Id: Iea3f4f3d2e5c6040c1e0bc7bfae8719cc7d8ac55
2020-06-09 13:56:17 +02:00
Mark Goddard
b84d2f8b77 Fix handler notification for mariadb-clustercheck
This was missed in the original patch.

Change-Id: I991b0563560cf4a0b1feb718951ffdf21ab81856
2020-06-08 14:43:34 +01:00
Zuul
522bc17981 Merge "Fix bug in deploying monasca_agent_forwarder" 2020-06-08 11:42:25 +00:00
wu.chunyang
3e9a648601 permission denied when enable_kolla_dev_mod
non-root user has no permission to create directory under /opt
directory. use "become: true" to resolve it.

Change-Id: I155efc4b1e0691da0aaf6ef19ca709e9dc2d9168
2020-06-07 19:36:42 +08:00
x191859
640bbc38ab Add missing become to some VMWare tasks
Fixed on ``Copying VMware vCenter CA file`` and ``Copying over nsx.ini``.

Change-Id: If909f59e7e4b241594c6b2567784ecad23e74226
Closes-Bug: #1882252
2020-06-05 16:53:27 +00:00
xiaojueguan
36587e4614 Fix bug in deploying monasca_agent_forwarder
Change-Id: I8633f7d250f331ca96788d8f4796889c3c312406
Closes-Bug: #1882259
2020-06-05 23:28:28 +08:00
Zuul
6394ab660e Merge "barbican: Use python3 plugin in uwsgi config" 2020-06-05 10:13:33 +00:00
Michal Arbet
f9c814a1a5 Fix STATIC_ROOT for Debian, Ubuntu
STATIC_ROOT in local_settings.py should be configured
to path which is also configured in apache's config.

For debian, ubuntu binary setup it is
/var/lib/openstack-dashboard/static.

Reason why it is "accidentaly" working is:

For debian package:
Package is overriding STATIC_ROOT in
/etc/openstack-dashboard/local_settings.d/_0003_debian_static_root.py.
But this is going to be removed from settings in
https://review.opendev.org/733607.

For ubuntu package:
Ubuntu package is adding patch to package which is including
PYTHON_PATH do /usr/share/openstack-dashboard/
And also they are creating several dirty symlinks to get it working.

This patch is fixing this behaviour more clearly.

Change-Id: I9862ac7ab462ca9018b684d63f26458ddda9f73a
2020-06-05 10:30:34 +02:00
Mark Goddard
895c86a846 barbican: Use python3 plugin in uwsgi config
backport: ussuri, train

Without this the container returns an empty response.

Change-Id: Ic36845f3fc625c080c92904b58ace070dd24fbb2
Closes-Bug: #1881784
2020-06-04 12:20:32 +01:00
Hervé Beraud
f78e2d7e69 Stop to use the __future__ module.
The __future__ module [1] was used in this context to ensure compatibility
between python 2 and python 3.

We previously dropped the support of python 2.7 [2] and now we only support
python 3 so we don't need to continue to use this module and the imports
listed below.

Imports commonly used and their related PEPs:
- `division` is related to PEP 238 [3]
- `print_function` is related to PEP 3105 [4]
- `unicode_literals` is related to PEP 3112 [5]
- `with_statement` is related to PEP 343 [6]
- `absolute_import` is related to PEP 328 [7]

[1] https://docs.python.org/3/library/__future__.html
[2] https://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html
[3] https://www.python.org/dev/peps/pep-0238
[4] https://www.python.org/dev/peps/pep-3105
[5] https://www.python.org/dev/peps/pep-3112
[6] https://www.python.org/dev/peps/pep-0343
[7] https://www.python.org/dev/peps/pep-0328

Change-Id: I907008ff4102806a6f7c88572f89f3beb500d9d7
2020-06-02 20:21:41 +02:00
Zuul
6f829575c9 Merge "Custom haproxy script for monitoring galera" 2020-06-02 15:01:55 +00:00
Zuul
05a2421b32 Merge "Switch to Monasca API for logs" 2020-06-02 13:17:56 +00:00
James Kirsch
ac20f9bd79 Fix glance backend TLS configuration task
Fix glance configuration task to create the backend PEM only on hosts with
glance service enabled.

Change-Id: I641c51761a99828854aafcc1e7354d6932d86659
2020-05-28 14:54:08 +00:00
Doug Szumski
b39a0f805a Switch to Monasca API for logs
The Monasca Log API has been removed and in this change we switch
to using the unified API. If dedicated log APIs are required then
this can be supported through configuration. Out of the box the
Monasca API is used for both logs and metrics which is envisaged to
work for most use cases.

In order to use the unified API for logs, we need to disable the
legacy Kafka client. We also rename the Monasca API config file
to remove a warning about using the old style name.

Depends-On: https://review.opendev.org/#/c/728638
Change-Id: I9b6bf5b6690f4b4b3445e7d15a40e45dd42d2e84
2020-05-23 17:49:32 +01:00
Zuul
9b8b7bf9b4 Merge "Remove post_config from the Kibana role" 2020-05-23 13:38:19 +00:00
xiaojueguan
fbc47e60e1 Remove post_config from the Kibana role
Since at least Stein, there is no visible effect from these tasks.
The Kibana dashboard seems to be working exactly the same,
greeting user on the first use with "please configure my index".
I tested on both Ubuntu and CentOS.
In new E*K stack (Ussuri+, CentOS8+) it even causes play errors.

Co-authored-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Change-Id: Iafc6986cce9cbaa0ea9e219ca85d7d01a61308cf
Closes-Bug: #1799689
2020-05-23 09:47:31 +02:00
Zuul
012c0b8e6a Merge "enable prometheus-openstack-exporter to use ca cert" 2020-05-22 19:15:10 +00:00
xiaojueguan
964ede7171 enable prometheus-openstack-exporter to use ca cert
you might refer to:
b0167b9412/openstack/clientconfig/results.go (L41)

Change-Id: Ia326360c412aad9ca4d1735cc6486aa2fce22c1a
Closes-Bug: #1850812
2020-05-21 12:58:15 +00:00
Michal Nasiadka
026f5cc48a Custom haproxy script for monitoring galera
Depends-On: https://review.opendev.org/710217/

Change-Id: I85652f23e487c40192106d23f2cdd45a3077deca
2020-05-20 13:02:44 +02:00
Zuul
7aef93a07a Merge "Fix cyborg api failed to load api-paste.ini file" 2020-05-19 12:06:20 +00:00