29 Commits

Author SHA1 Message Date
Juan Antonio Osorio Robles
a37f9c81ee rabbitmq SSL: check puppet resource instead of actual config
The configuration is done via the oslo::messaging::rabbit resource
from puppet-oslo. We should be checking for the resource that we're
using instead of the underlying configuration file.

Change-Id: Ic078c7f036ce93fc91bd496884e4423b9653b1c8
2017-03-10 16:47:01 +00:00
ZhongShengping
4570df5d79 Add control_exchange and rpc_response_timeout options
Add control_exchange to configure an exchange name for message.
Add rpc_response_timeout to configure seconds time for waiting
for a response from a call.

Change-Id: I255c4ceda252f0f39eecc823cef2820c9e7b1e48
2017-01-28 13:52:04 +08:00
Alex Schultz
3c9a2a8611 Add oslo_messaging_notifications transport_url
Adding the ability to configure the oslo_messaging_notifications
transport_url.

Change-Id: I55b718618d3ede8b0483bd8b4c0877339b6fc0b4
2016-12-14 09:57:31 -07:00
Alex Schultz
1b123d9be5 Deprecate rabbitmq connection parameters
The rabbitmq connection parameters have been deprecated in favor of the
transport_url setting.

Change-Id: I891570dde75dc58f45e5ad6386be9e522b2706eb
Related-Bug: #1625198
2016-11-08 12:43:44 -07:00
iberezovskiy
51c2793738 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
  * update docs for notify::rabbitmq class
  * drop deprecated rabbit_durable_queues parameter
  * fix notification parameters according to mitaka config file

Change-Id: Ib20c13f136a299c958d9ac064e8ad93ceb0ebd40
2016-04-13 13:29:23 +03:00
Mykyta Karpin
037545fb3e Switch glance to os_service_default facts
Change-Id: If860858e2bdfe0387b6a3260b81a97625d05b9fe
2016-04-06 18:56:34 +03:00
Alex Schultz
cda71192de Switch glance to rspec-puppet-facts
This change updates the glance tests to use rspec-puppet-facts to test
multiple operating systems.

Change-Id: I75fd8970ba8335cb4ffa09a7d600415056e9f889
2016-02-29 16:33:46 -07:00
Xingchao Yu
81333fce40 Add rabbit_ha_queues option
There are two ways 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. When users try the second method:
changing rabbit_ha_queues to true. If they don't set rabbit_hosts,
then current logic will not work.

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

Change-Id: I9f61c113b41cb00f7f95e80e2cabe1641aed74e7
Close-Bug: #1485287
2016-01-07 08:57:52 +00:00
Mykyta Karpin
938e7679e6 add more settings to glance api, registry, rabbitmq
settings added:

delayed_delete
scrub_time
signing_dir
token_cache_time
image_cache_stall_time
image_cache_max_size
kombu_reconnect_delay

Change-Id: Id7a6894e5bb12fc7697dfe23e5f9d4a44a719086
2015-12-09 11:51:27 +02:00
Mykyta Karpin
acd95e6a3a Add support of os_service_default fact in glance spec
This change adds possibility to use the os_service_default
   fact for configuration options that default to '<SERVICE DEFAULT>'.
   this change is done by analogy with cinder
   commit 667e6c0850672dbbf99381eb92468f95e5591913

Change-Id: Ie5c8909bcc1c9a6a7a9ab1b59eec4637751ffd74
2015-11-20 12:53:35 +00:00
Denis Egorenko
8a3981a43a Change section name for AMQP rabbit parameters
Parameter 'amqp_durable_queues' under section 'DEFAULT' now is
deprecated since Liberty and should be placed under certain
rpc backend section [1,2]

[1] https://github.com/openstack/oslo.messaging/blob/liberty/oslo_messaging/_drivers/amqp.py#L36
[2] http://docs.openstack.org/liberty/config-reference/content/configuring-rpc.html

Change-Id: I925470be2df1983ffce4eaf5df9c1f5c48705255
2015-10-21 20:01:22 +03:00
Mike Dorman
8e40680310 Add support for RabbitMQ connection heartbeat
Kilo oslo.messaging added heartbeating support for RabbitMQ
connections.  This patch adds support for this in Puppet modules
by managing the oslo_messaging_rabbit/heartbeat_timeout_threshold
and oslo_messaging_rabbit/heartbeat_rate settings.

Closes-bug: 1467667
Change-Id: I3aef101e3a099bcbd96ee32efa7c5f849e6000cf
2015-07-07 11:27:25 -06:00
Colleen Murphy
268370457c Revert "Revert "Move rabbit/kombu settings to oslo_messaging_rabbit section""
This reverts commit d302170d260f4e6585fedc1b4709c953d0491c56.

We  can unrevert this change once we are ready for kilo specific
changes.

Change-Id: I3079727c8333de3e9b4382a68fca3ef293ce2d48
2015-04-17 10:14:38 -07:00
Colleen Murphy
d302170d26 Revert "Move rabbit/kombu settings to oslo_messaging_rabbit section"
This reverts commit e6e8f6a56231409028ff1e7cdcd44781ca37d5b0.

Kilo deprecates these settings, but they still work. We should wait to
merge this until upstream distro packages are ready so that master is
not broken.

Change-Id: Ib05943e89969eb810527943426c566cf4a77e7ad
2015-04-17 17:13:52 +00:00
Mike Dorman
e6e8f6a562 Move rabbit/kombu settings to oslo_messaging_rabbit section
Kilo oslo-messaging deprecates rabbit/kombu settings in the
DEFAULT section.

Move these settings to proper oslo_messaging_rabbit section.

Change-Id: Ica8cd70ece41f55b827f74d3f14cbc35f37ae13d
2015-04-02 22:54:42 -06:00
Sebastien Badia
dbe297b056 spec: updates for rspec-puppet 2.x and rspec 3.x
This patch aim to update our specs test in order to work with the rspec-puppet release
2.0.0, in the mean time, we update rspec syntax in order to be prepared
for rspec 3.x move.

In details:

  * Use shared_examples "a Puppet::Error" for puppet::error tests
  * Convert 'should' keyword to 'is_expected.to' (prepare rspec 3.x)
  * Fix spec tests for rspec-puppet 2.0.0
  * Upgrade and pin rspec-puppet from 1.0.1 to 2.0.0
  * Clean Gemfile (remove over-specificication of runtime deps of puppetlabs_spec_helper)

Change-Id: Ibd0333dc3c0959e846edfbad51fb48e8dfb8fbe9
Card: https://trello.com/c/eHXc1Ryd/4-investigate-the-necessary-change-to-be-rspec-puppet-2-0-0-compliant
2015-02-25 05:37:44 +01:00
Lukas Bezdicka
15b0a7dc82 Makes kombu_ssl_* parameters optional when rabbit_use_ssl => true
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: I1b2cbb15a7778c3d072409c43b39d1f41b7b48b6
Closes-Bug: 1356083
2015-02-02 13:36:54 +01:00
Lukas Bezdicka
592503bef1 Switch to TLSv1 as SSLv3 is considered insecure and is disabled by default
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+

Closes-Bug: #1409667
Change-Id: I6dd2dcf7d047d8cee028c3f890221194b0179b8a
2015-01-12 16:42:01 +00:00
Stefano Zilli
a0c5c271ef Hide secrets from puppet logs
Currently secrets like rabbit_password or admin_password are displayed in
puppet logs when changed. This commit changes glance_*_config and
glance_*_ini types adding a new parameter that triggers obfuscation of
the values in puppet logs.

Change-Id: I31f974a9afadef42939ee092ecba3b8f4333bb8b
Closes-Bug: #1328448
2014-07-12 02:42:13 +02:00
Yanis Guenane
c891ed9ef2 Fail when ssl parameters are missing and rabbit_use_ssl is set to true
This commit causes the run to fail is rabbit_use_ssl parameter is set
to true but the ssl related parameters remains undef.

Change-Id: I12a8a87dde45a06d35c6d3e90ef2637085fdba86
2014-05-16 12:22:11 -04:00
Bogdan Dobrelya
d40f3d8622 Add multiple rabbit hosts support
* Use new oslo.messaging conf options for rabbit_hosts and
  rabbit_ha_queues for glance::notify::rabbitmq class
* Warn on deprecated rabbit_durable_queues and use amqp_* instead
* Fix/add rspecs
* Fix a mess with wrong notification_driver usage
* Update README with usage example

DocImpact
Closes-bug: #1259193
Closes-bug: #1312054
Closes-bug: #1312658
Closes-bug: #1313553

Change-Id: I16b8e71db20602986a7afe8d24e7faba91a0997f
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
2014-05-05 09:28:27 +03:00
Benedikt Trefzer
353a8cf11f add kombu_ssl parameters to notify::rabbitmq
This adds the following parameters:
  * kombu_ssl_ca_certs
  * kombu_ssl_certfile
  * kombu_ssl_keyfile
  * kombu_ssl_version
these are necessary to establish a secure ssl
connection to rabbitmq.

Change-Id: Ia9ea7cf44664f71a4fb5cc76e3474aa54a9bb30d
2014-04-25 23:14:08 +02:00
Christian Berendt
13b832ddf2 replaced deprecated parameter notifier_strategy
The configuration option 'notifier_strategy' has been deprecated
in favor of 'notification_driver'.

Change-Id: Ia51aa6772df8736c57f0fb2223b6a680e3dfb11d
2014-04-04 13:13:26 +02:00
Xingchao Yu
e2fef179c1 Update glance::notify::rabbitmq options
This patch is aim to update rabbitmq options in notify::rabbitmq
class to keep consistent with glance-api.conf. And fix description
error in comment.

Fixes bug #1221008

Change-Id: I441a61bb683552e1696f779c733db561cca03b64
2013-09-06 09:12:53 +08:00
Dan Bode
7c396acd66 remove password defaults
This commit removes the password defaults.

Users should not rely on password defaults.
2012-10-14 12:36:13 -07:00
Dan Bode
e6216be659 fix unit tests 2012-10-14 00:23:20 -07:00
root
38622827fe This commit fixes spec test failures that were caused by
using RI's version of the concat module.

It introduces a custom fact concat_basedir that can determine
where the vardir is for a particular agent.

This commits adds that fact to unit tests that are validating
the resuling fragment files.
2012-05-08 14:38:55 -07:00
Dan Bode
a7a96af75e Fix broken tests
I had previously checked in some broken tests that
resulted from the updating the concat fragments names
to ensure uniqueness between services (eg, choosing
fragment names like HEADER were causing
duplicate resource errors, these have been prefixed
with the service name glance-api to ensure uniqueness)

This commit updates the tests so that they work for
this previous commit (oops!)
2012-04-03 10:03:08 -07:00
Dan Bode
0a400dcc6a Add rspec tests
This commit resolves failing tests from
glance::api and glance::registry related to recent
refactors.

It also adds tests for all of the new api fragment
classes/defines.
2012-03-31 16:09:29 -07:00