From 177cf07afd31fe9906f12418a0cb64ad6b20a191 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sat, 8 Jan 2022 12:50:10 +0900
Subject: [PATCH] trove: Use new service_credentials classes

Change-Id: If9bdc8d28af2ec83760bc240808cc5c1a0aa2ac6
---
 manifests/trove.pp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/manifests/trove.pp b/manifests/trove.pp
index c658113bb..8f15217b9 100644
--- a/manifests/trove.pp
+++ b/manifests/trove.pp
@@ -42,7 +42,6 @@ class openstack_integration::trove {
     database_connection        => 'mysql+pymysql://trove:trove@127.0.0.1/trove?charset=utf8',
     rabbit_use_ssl             => $::openstack_integration::config::ssl,
     amqp_sasl_mechanisms       => 'PLAIN',
-    nova_proxy_admin_pass      => 'a_big_secret',
   }
   class { 'trove::db::mysql':
     charset  => $::openstack_integration::params::mysql_charset,
@@ -62,6 +61,10 @@ class openstack_integration::trove {
     www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri,
     memcached_servers    => $::openstack_integration::config::memcached_servers,
   }
+  class { 'trove::api::service_credentials':
+    password => 'a_big_secret',
+    auth_url => $::openstack_integration::config::keystone_auth_uri,
+  }
   class { 'trove::api':
     bind_host => $::openstack_integration::config::host,
     workers   => 2,
@@ -69,14 +72,24 @@ class openstack_integration::trove {
     key_file  => $key_file,
   }
   class { 'trove::client': }
+  class { 'trove::conductor::service_credentials':
+    password => 'a_big_secret',
+    auth_url => $::openstack_integration::config::keystone_auth_uri
+  }
   class { 'trove::conductor':
-    debug    => true,
-    workers  => 2,
-    auth_url => $::openstack_integration::config::keystone_auth_uri,
+    debug   => true,
+    workers => 2,
+  }
+  class { 'trove::taskmanager::service_credentials':
+    password => 'a_big_secret',
+    auth_url => $::openstack_integration::config::keystone_auth_uri
+  }
+  class { 'trove::guestagent::service_credentials':
+    password => 'a_big_secret',
+    auth_url => $::openstack_integration::config::keystone_auth_uri
   }
   class { 'trove::taskmanager':
     debug                   => true,
-    auth_url                => $::openstack_integration::config::keystone_auth_uri,
     use_guestagent_template => false,
   }
   class { 'trove::quota': }