From b34458f3753ba30e3882d1931bf7c8f91953a2cb Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 18 Dec 2023 11:15:38 +0900
Subject: [PATCH] zaqar: Fix incomplete trustee options

The trustee option should contain the complete credential information
for authentication.

Change-Id: I4c6a8fc97e9632867436d2287fd28fa50a1eec08
---
 manifests/zaqar.pp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/manifests/zaqar.pp b/manifests/zaqar.pp
index a74b22d69..e0550504e 100644
--- a/manifests/zaqar.pp
+++ b/manifests/zaqar.pp
@@ -30,7 +30,11 @@ class openstack_integration::zaqar {
     internal_url => "ws://${::openstack_integration::config::ip_for_url}:8888",
     admin_url    => "ws://${::openstack_integration::config::ip_for_url}:8888",
   }
-  class {'zaqar::management::sqlalchemy':
+  class { 'zaqar::keystone::trust':
+    auth_url => "${::openstack_integration::config::keystone_auth_uri}/v3",
+    password => 'a_big_secret'
+  }
+  class { 'zaqar::management::sqlalchemy':
     uri => os_database_connection({
       'dialect'  => 'mysql+pymysql',
       'host'     => $::openstack_integration::config::ip_for_url,
@@ -41,11 +45,11 @@ class openstack_integration::zaqar {
       'extra'    => $::openstack_integration::config::db_extra,
     }),
   }
-  class {'zaqar::messaging::swift':
+  class { 'zaqar::messaging::swift':
     auth_url => "${::openstack_integration::config::keystone_auth_uri}/v3",
     uri      => 'swift://zaqar:a_big_secret@/services',
   }
-  class {'zaqar::keystone::authtoken':
+  class { 'zaqar::keystone::authtoken':
     password                     => 'a_big_secret',
     user_domain_name             => 'Default',
     project_domain_name          => 'Default',
@@ -54,12 +58,12 @@ class openstack_integration::zaqar {
     memcached_servers            => $::openstack_integration::config::memcached_servers,
     service_token_roles_required => true,
   }
-  class {'zaqar':
+  class { 'zaqar':
     unreliable       => true,
     management_store => 'sqlalchemy',
     message_store    => 'swift',
   }
-  class {'zaqar::server':
+  class { 'zaqar::server':
     service_name => 'httpd',
   }
   class { 'zaqar::wsgi::apache':