From d53abb5c1e152f7d2cec0cb8bab882a1a5d14c28 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 4 Mar 2022 11:04:26 +0900
Subject: [PATCH] Watcher: use the new class for watcher_clients_auth
 parameters

Depends-on: https://review.opendev.org/831888
Change-Id: I47aa2c7dfa6f7468302a02df533029479c3da2c8
---
 manifests/watcher.pp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/manifests/watcher.pp b/manifests/watcher.pp
index 0ea69d250..4e08e9e65 100644
--- a/manifests/watcher.pp
+++ b/manifests/watcher.pp
@@ -59,16 +59,17 @@ class openstack_integration::watcher {
     rabbit_use_ssl             => $::openstack_integration::config::ssl,
     amqp_sasl_mechanisms       => 'PLAIN',
   }
+  class { 'watcher::watcher_clients_auth':
+    password            => 'a_big_secret',
+    project_domain_name => 'Default',
+    user_domain_name    => 'Default',
+    project_name        => 'services',
+    auth_url            => "${::openstack_integration::config::keystone_admin_uri}/v3",
+  }
   class { 'watcher::api':
-    bind_host                          => $::openstack_integration::config::host,
-    watcher_client_password            => 'a_big_secret',
-    watcher_client_project_domain_name => 'Default',
-    watcher_client_user_domain_name    => 'Default',
-    watcher_client_project_name        => 'services',
-    watcher_client_auth_uri            => "${::openstack_integration::config::keystone_auth_uri}/v3",
-    watcher_client_auth_url            => "${::openstack_integration::config::keystone_admin_uri}/v3",
-    upgrade_db                         => true,
-    service_name                       => 'httpd',
+    bind_host    => $::openstack_integration::config::host,
+    upgrade_db   => true,
+    service_name => 'httpd',
   }
   include apache
   class { 'watcher::wsgi::apache':