55 Commits

Author SHA1 Message Date
Takashi Kajinami
4d87fa2c69 Clean up deprecated items related to conductor/taskmanager
This change removes deprecated parmaeters and classes related to
trove-conductor and trove-taskmanager. These were deprecated during
past cycles and are ready to be removed.

Depends-on: https://review.opendev.org/839061
Change-Id: I250fb4cd098b7aaa6f4b9488e7226ffb27355046
2022-04-22 13:42:46 +00:00
Takashi Kajinami
f1c11c68d5 Use single trove.conf for api, conductor and taskmanager
Previously puppet-trove creates separate config files for each service
but these individual files have been removed from Trove by [1].

This change follows that decision and merge these three files into
the single trove.conf file.

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

Change-Id: I23c01acd9439335abb706f2528684d4ec473247d
2022-03-07 23:56:02 +00:00
Takashi Kajinami
4b3962b803 Fix ignored auth_url parameters
The change d9759d24884cee443b5e9bd57bde1fb738271fdd incorrectly
implement parameter usage and it made auth_url parameters of
the following classes ineffective.
 - trove::taskmanager
 - trove::conductor

This change fixes these two parameters and ensures these the given
values are used to define config values. These parameters are also
deprecated to be replaced completely by the service_credential classes.

Change-Id: I028af124586ce366545b189694f9459597ce5ac1
2022-01-08 12:58:05 +09:00
ZhongShengping
8cee8b5eca Deprecate allow_insecure_clients option
The allow_insecure_clients has been deprecated[1].

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

Change-Id: Ibc83b18732269ce72ae51cbd5218e1ce772ae6a8
Closes-Bug: #1902158
2020-11-02 15:33:44 +08:00
Tobias Urdin
05a2bd8514 Change to relative include
Change-Id: I8c10ceaaeea23e711804d5fef55474a1474da3a8
2020-07-13 23:45:55 +02:00
Takashi Kajinami
1d3bffd18b Use service credential parameters to define keystone v3 auth
Change-Id: I67ac8b41365e1d6f90b8982659b9fd52744d2ad7
2020-05-06 21:36:00 +09:00
Tobias Urdin
a053d4e86e Convert all class usage to relative names
Change-Id: Ic7b8f4e584e3f1ed1d5c6c568cc6caf67493cdda
2019-12-08 23:24:12 +01:00
Tobias Urdin
f11194a463 Remove faulty set rabbitmq options
These are set but those variables is not
available in the init.pp class and was
removed in [1].

[1] https://review.openstack.org/#/c/570311/

Change-Id: I774ef7e5ad7944573ae537fda72c2ab57584a018
2018-10-21 17:50:02 +02:00
ZhongShengping
2a99e642d8 Remove deprecated ensure_package option
Change-Id: I4d667ea525c9b7a48d8175b37c1cdfb55543ed39
2018-03-29 12:01:15 +08:00
ZhongShengping
ccf6a66e1f Add kombu_failover_strategy option
Adds the kombu_failover_strategy option for configuring
oslo.messaging.rabbit. This will determines how the next RabbitMQ node
is chosen in case the one we are currently connected to becomes
unavailable.

Change-Id: If59b301e533a509051876ed88f410c5101425ec2
Closes-Bug: #1748353
2018-02-09 15:05:28 +08:00
Alfredo Moralejo
aa57603fb4 Force trove_auth_url to point to the v3 api URL
After removing keystone API v2, trove requires that
trove_auth_url parameter has the v3 URL. Note that
versionless url is not valid for trove_auth_url so
this patch enforces v3 url even when auth_url is
not versioned.

Additionally, the default value for auth_url parameter
has been updated to point to v3.

Change-Id: I8d0e200958c813101d72e180c6da8343b5fcae6e
2017-10-20 09:55:39 +02:00
Andrew Smith
6e1a56adb1 Deprecate oslo.messaging rpc_backend option parameter
Oslo.messaging uses the transport_url to represent the rpc and
notification messaging driver to use and its full configuration. The
rpc_backend configuration option is deprecated for removal and
should not gate oslo.messaging driver configuration options.

This patch:
* deprecate rpc_backend
* remove conditional check
* update spec tests
* add release note

Change-Id: Idbd5c231d85a0f4d249dabd14bc829844ee3e83d
2017-07-27 12:14:53 -04:00
Jenkins
7594ac4415 Merge "Inconsistent package_ensure parameter name" 2017-03-10 11:31:26 +00:00
Andy Botting
7fdbe6e50c Add support for single tenant mode
Single tenant mode creates all DBaaS resources in a given tenant,
rather than the default, which is to use the users own tenant.
It relies on the nova_proxy_admin_* vars for this.

This commit adds a new trove::single_tenant_mode variable, when set
to true, sets up the remote_(nova|cinder|neutron)_client config
vars in the each of the config files for this mode to be enabled.

Change-Id: Ic59bd227fff893c705931ced3add636844533d35
2017-03-09 12:51:15 +11:00
ZhongShengping
3cf985f57e Inconsistent package_ensure parameter name
The parameter name used to enforce package state is inconsistent across
manifests and modules. I settle on package_ensure since it's already
widely used.

Change-Id: I887e924d184d9b25c33b5fe617d82f170d0cee34
Closes-Bug: #1668732
2017-03-09 09:25:07 +08:00
ZhongShengping
370c0bf8fa Add rpc_response_timeout option
Add rpc_response_timeout to configure seconds time for waiting
for a response from a call.

Change-Id: Ib107713d8b2cc137e11c3d478f14f8a4f4d034a3
2017-02-08 11:35:26 +08:00
ZhongShengping
9a54d07420 Fix database_idle_timeout option
Change-Id: Icf527a40c9e18aef4444638a92ce70266dfdadec
Closes-Bug: #1653603
2017-01-03 14:49:39 +08:00
Jenkins
dfe7564169 Merge "Remove verbose" 2016-10-24 18:47:25 +00:00
Jenkins
0c14143f40 Merge "Fix documentation for log_dir parameter" 2016-10-22 04:04:31 +00:00
Mykyta Karpin
39062e3ac9 Fix documentation for log_dir parameter
Change-Id: Id7bbb1aa48c282269d1dffe0bc1ccd7afd1bf6f5
Partial-Bug: #1600294
2016-10-10 17:31:27 +03:00
Maksym Yatsenko
86221d0df0 Change worker defaults to ::os_workers
This patch changes the default worker count from ::processorcount to the
new ::os_workers fact. ::os_workers is based on the number of processors
(currently cpu/4) but is capped at a maximum of 8 worker processors.
This is a much more reasonable default in general and prevents excessive
resource consumption on systems with a large number of CPUs.

Change-Id: Idfd8e3f4fe91df7d70e8c35a491c076b0b8f2348
2016-10-08 02:07:19 +03:00
Iury Gregory Melo Ferreira
01e4cea5d2 Remove verbose
Since we are in Ocata we should remove the
verbose option that was deprecated

Change-Id: I2b35fe30e4e5049b15e6cc58b81c8b202db56191
2016-09-27 19:46:42 -03:00
Alex Schultz
9ebd92afbe Update log_file documentation
log_file should be set to $::os_service_default and not to the boolean
false because the boolean false gets interpreted as a file name.

Change-Id: Ie52ea5bbd5e921aeede7a5b3c532c20574728bc2
2016-09-08 17:49:22 -06:00
Andrew Smith
7cb103c17f Add transport_url parameters for oslo.messaging
This commit adds the transport_url parameters for oslo.messaging. The
url is of the form:

  transport://user:pass@host1:port[,hostN:portN]/virtual_host

Where the transport scheme specifies the rpc or notification backend
as one of rabbit, amqp, zmq, etc. Oslo.messaging is deprecating the
host, port, and auth configuration options [1]. All drivers will get
these options via the transport_url.

This patch:
* use oslo::messaging::default resource
* use oslo::messaging::notifications resource
* add parameters for transport_url(s)
* correct config file for amqp backend
* update spec tests
* add feature release note

[1] https://review.openstack.org/#/c/317285/

Change-Id: I8d0132f23aa05ed267ff2d88bce61ce9f20160f5
2016-06-28 13:17:26 +00:00
Alex Schultz
4d5c63416f Lint fixes for absolute class name
This change updates the mysql require lines to resolve lint errors.

Change-Id: I824672198f6af1505d5117ebd4ff1c4d356bb865
2016-06-28 07:17:02 -06:00
Iury Gregory Melo Ferreira
a498d302b7 Revert "Trove Deprecations"
This commit partially reverts original commit.

use_syslog option is not deprecated and still actual.

This reverts commit 700ddfd674a817c190916890a4a74f82ed82d3c1

Change-Id: Ie7515a45abeb3b0b4a7833bd19a32fbab759765a
2016-05-31 12:19:24 -03:00
Iury Gregory Melo Ferreira
2d5ee453cf Trove Deprecations
Deprecation of parameters listed in Mitaka during Newton cycle [1]

[1] http://docs.openstack.org/mitaka/config-reference/tables/conf-changes/trove.html

Change-Id: I700ddfd674a817c190916890a4a74f82ed82d3c1
2016-05-27 12:34:18 -03:00
Iury Gregory Melo Ferreira
8246a80558 Deprecate verbose option in logging
Option "verbose" from group "DEFAULT" is deprecated for removal.
The parameter has no effect.
Deprecated verbose in all classes
Remove verbose in README
Remove verbose from tests.
If this option is not set explicitly, there is no such warning.

Change-Id: Iedbc3ea8824fdef8e1e5434d8be9463704c0579a
2016-05-18 13:34:00 -03:00
Jenkins
364cd54b74 Merge "Introduce support for oslo.messaging amqp driver configuration" 2016-05-17 16:34:04 +00:00
Alexey Deryugin
8d7be7ac23 Use oslo module for logging
Additonal changes:

  * switch logging related parameters to $::os_service_default
    as they are used in oslo::log
  * update unit tests

Change-Id: I1884387b438e3885986d031f95ba323e57aac7ab
2016-05-13 18:43:04 +03:00
Andrew Smith
52371ee818 Introduce support for oslo.messaging amqp driver configuration
This commit adds support for the oslo.messaging amqp rpc_backend
which enables the AMQP 1.0 driver. A proposed feature for the
Newton oslo.messaging release is an update to the AMQP 1.0 driver
to support a stateless messaging interconnect for RPC traffic [1].

This patch:
* use oslo::messaging::amqp resource
* add new parameters for the oslo_messaging_amqp driver
* update spec tests for amqp as alternate rpc_backend
* add feature release note

[1] https://blueprints.launchpad.net/oslo.messaging/+spec/amqp-dispatch-router

Change-Id: I8306c56e86f2f8a8d6da1ecbf5eab674e6b1e8bf
2016-05-12 16:13:30 -04:00
Jenkins
151ca19923 Merge "Use oslo module for messaging (rabbit) configuration" 2016-04-23 12:28:21 +00:00
Alexey Deryugin
24839ec63f Use oslo module for messaging (rabbit) configuration
Additonal changes:

  * switch messaging related parameters to $::os_service_default
    as they are used in oslo::messaging_rabbit define
  * update unit tests

Change-Id: I3f7800f78132fa4c6c639753327ff63cf337c285
2016-04-22 15:45:13 +00:00
ZhongShengping
06a8eefb16 Remove the extra space in the conductor.pp
Change-Id: I14d7af4e089b31da8770ec1376c44f1d79a1fa43
2016-04-21 08:45:37 +08:00
Denis Egorenko
3352d44262 Totally drop Qpid support
Qpid was removed in Mitaka from Oslo Messaging, so now we can
drop it in manifests.

Change-Id: Ie33f82b278bdb685cf1c78b704725eb03be1a19e
2016-04-18 14:11:52 +03:00
Xiaohua Yuan
6798619a06 Add related parameters to profiler section
This patch is aim to following params in puppet-trove class:
  - enabled
  - trace_sqlalchemy

Change-Id: Icbeedc4a74a8a7d25828ed8c4501c843c5252644
closes-Bug: #1567192
2016-04-07 07:59:16 -07:00
Emilien Macchi
50dec1e92e conductor: add workers parameter
Allow to configure workers for trove conductor.
Keep default from upstream, which is the same as API.

Change-Id: I942addf4347aaf813ef40d2ab39bac69a85a1a33
2016-04-01 12:01:06 -04:00
Matt Fischer
59f75e6085 Trove external dependency management
Move all dependency tracking to an external class which simplifies the
relationships and allows managing Trove without necessarily using
packages.

This change also cleans up how the client is handled to make
it more configurable and match other modules.

Finally the reference to the deprecated and non-functional
keystone::python class is dropped.

Change-Id: I943685fbeb114dead80b7465b8f5c564a0bc9fe0
2016-03-21 19:42:26 -06:00
Xingchao Yu
d91b9599b4 Introduce amqp_durable_queues option
amqp_durable_queues option is already defined in trove class,
but is not be used in other trove class.

Close-Bug: #1486319
Change-Id: Ifd4411ce90db26d6f12e714fdc5c54ea507975fd
2016-01-07 04:04:40 +00:00
Xingchao Yu
2443294da2 Add rabbit_ha_queues option
There are two methods for setting up RabbitMQ HA:

 1. Configure rabbit_hosts to multi rabbit hosts.
 2. Setting up a loadbalancer in front of RabbitMQ cluster,
    provide a unique address in rabbit_host

In current, rabbit_ha_queues option is controled by rabbit_hosts IF
conditional statement. But when users want to use the second method:
changing rabbit_ha_queues to true, but they don't use rabbit_hosts
option, this logic will not work.

This patch adds an rabbit_ha_queues option, set it to undef by
default for forward compatbility.

Close-Bug: #1485287
Change-Id: Ib8fe16182188729100ef4704466c4d42d31ff510
2016-01-07 03:49:36 +00:00
Jenkins
98ba7b3b6d Merge "Remove trove ubuntu package hack" 2015-12-10 17:49:21 +00:00
Denis Egorenko
05cbdefa6b Remove qpid messaging support
Qpid messaging driver is removed from Oslo.messaging [1]
Therefore, we cannot support it anymore.

[1] I4a9cba314c4a2f24307504fa7b5427424268b114

Change-Id: I4d4c200e733568d33116728e19377575b92331ca
2015-12-07 20:44:35 +03:00
Lukas Bezdicka
0f3cbadfff Remove trove ubuntu package hack
Bug #1365561 has been marked as fixed so it should be safe to remove
hack adding group and file before installing package.

Change-Id: Id447a47a056a41d8c98b01d6769f4121a36d7aae
2015-12-03 16:05:00 +01:00
Emilien Macchi
0299eeb5da Fix rabbit_userid parameter
A bug was introduced in [1], the lookup to find rabbitmq user was wrong.
This patch uses the right parameter again.

[1] 86b7d23f29

Change-Id: Ib23bde57f9a99707917525977d94da891e5a16dd
2015-11-03 12:33:43 -05:00
Javier Pena
03f5a793a6 Simplify rpc_backend parameter
It is no longer necessary to specify the whole python namespace
for the backends, and
http://docs.openstack.org/developer/oslo.messaging/opts.html lists
the short versions.

This patch maintains backwards compatibility with the previous
default value in case it is explicitly used.

Change-Id: Ic16d12e9e84083c09f3d725e5a15f4c3d7279792
2015-10-13 10:32:09 +02:00
Javier Pena
2a020fdf93 Complete qpid support
The puppet-trove module only had partial, non-working qpid support
until now. The qpid_* parameters were documented and included in
some manifests, but not in init.pp, and rpc_backend was never set
in the config files, so Trove would always use RabbitMQ.

The fix also includes moving qpid parameters from the DEFAULT
section to oslo_messaging_qpid in the config files, to avoid
deprecation warnings in Kilo and later releases.

Change-Id: I12853f843f40e2312e7fe3bb81739be743641583
Closes-bug: #1468312
2015-06-30 11:30:10 +02:00
Lukas Bezdicka
86b7d23f29 Sync amqp support with other openstack modules
Kilo oslo-messaging deprecates rabbit/kombu settings in the
DEFAULT section.

Rabbitmq won't talk to us anymore if we try to use SSLv3 as it disabled
support for SSLv3. Openstack components use python's openssl
implementation which does not support TLSv1.1 and TLSv1.2 yet so we
just switch to TLSv1. Support for newer TLS should come with python
2.7.9+

The kombu_ssl_* parameters should not be required when rabbit_use_ssl => true
Rather, rabbit_use_ssl must be set to true if the kombu_ssl_* parameters are
used.

Change-Id: I327dc193d878cb1574b69d5f5b502c25fa203a66
Closes-Bug: #1409667
Closes-Bug: #1356083
2015-06-12 04:40:07 +00:00
Emilien Macchi
fead756a6c Create Trove config before dbsync
Because packaging is trying to run dbsync while default config is
broken, as a woraround we manage Trove config *before* installing the
package so we can continue the installation with Puppet.

Also add a require to Package['trove-api'] on trove::db::sync class to
make sure trove-manage is installed before running the actual command.

This is a workaround and it could be reverted later when packaging issue
is triaged.

Change-Id: I82dc8b653bbbdc28bd165292649332310f252916
Partial-bug: #1451134
2015-05-04 23:13:15 -04:00
Lukas Bezdicka
b032aca232 Change sql_connection to connection.
Sql connection parameter is now in database/connection not
DEFAULT/sql_connection.

Change-Id: I5f7b48a1a6e092b9629145b57795cba0c351a4eb
2015-03-31 09:10:07 +00:00
Sebastien Badia
feee104f7f Add Puppet 4.x lint checks
This changes the puppet-lint requirement to 1.1.x, so that we can use
puppet-lint plugins. Most of these plugins are for 4.x compat, but some
just catch common errors.

Change-Id: I34c2eedd78868687613c7f89ce9aef92197f6c69
2015-03-16 18:41:48 +00:00