From 1f45513e655cafb864ca172d37223c017dadd55b Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 5 Jul 2022 12:18:45 +0900 Subject: [PATCH] Magnum: Use common implementation to set up rabbitmq access Change-Id: Ibbffc177c7ea74f9182c08fcfa56f8d27ea23fc6 --- manifests/magnum.pp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/manifests/magnum.pp b/manifests/magnum.pp index fe4b4b10e..133ad0052 100644 --- a/manifests/magnum.pp +++ b/manifests/magnum.pp @@ -13,18 +13,9 @@ class openstack_integration::magnum ( include openstack_integration::config include openstack_integration::params - rabbitmq_user { 'magnum': - admin => true, + openstack_integration::mq_user { 'magnum': password => 'an_even_bigger_secret', - provider => 'rabbitmqctl', - require => Class['rabbitmq'], - } - rabbitmq_user_permissions { 'magnum@/': - configure_permission => '.*', - write_permission => '.*', - read_permission => '.*', - provider => 'rabbitmqctl', - require => Class['rabbitmq'], + before => Anchor['magnum::service::begin'], } if $::openstack_integration::config::ssl {