From 41380b5106c2cca554009f5f5d4e4e9e8db48698 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 5 Aug 2021 08:12:10 +0900
Subject: [PATCH] Replace deprecated database_connection of puppet base classes

Database parameters in base classes were deprecated in favor of
duplicated parameters in independent db classes.

Change-Id: I32db5e15cbdc5d61b51690e70cce3d74ef917e84
---
 deployment/cinder/cinder-base.yaml                 | 2 +-
 deployment/deprecated/mistral/mistral-base.yaml    | 2 +-
 deployment/heat/heat-engine-container-puppet.yaml  | 2 +-
 deployment/ironic/ironic-base-puppet.yaml          | 2 +-
 deployment/keystone/keystone-container-puppet.yaml | 2 +-
 deployment/nova/nova-apidb-client-puppet.yaml      | 2 +-
 deployment/nova/nova-db-client-puppet.yaml         | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/deployment/cinder/cinder-base.yaml b/deployment/cinder/cinder-base.yaml
index b407496d7e..5a0347d7fe 100644
--- a/deployment/cinder/cinder-base.yaml
+++ b/deployment/cinder/cinder-base.yaml
@@ -112,7 +112,7 @@ outputs:
     value:
       service_name: cinder_base
       config_settings:
-        cinder::database_connection:
+        cinder::db::database_connection:
           make_url:
             scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
             username: cinder
diff --git a/deployment/deprecated/mistral/mistral-base.yaml b/deployment/deprecated/mistral/mistral-base.yaml
index 96a81ec6f3..077ad1ba55 100644
--- a/deployment/deprecated/mistral/mistral-base.yaml
+++ b/deployment/deprecated/mistral/mistral-base.yaml
@@ -72,7 +72,7 @@ outputs:
     value:
       service_name: mistral_base
       config_settings:
-        mistral::database_connection:
+        mistral::db::database_connection:
           make_url:
             scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
             username: mistral
diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml
index 13070a46f7..fb533bf14d 100644
--- a/deployment/heat/heat-engine-container-puppet.yaml
+++ b/deployment/heat/heat-engine-container-puppet.yaml
@@ -167,7 +167,7 @@ outputs:
             heat::engine::convergence_engine: {get_param: HeatConvergenceEngine}
             heat::engine::client_retry_limit: {get_param: ClientRetryLimit}
             tripleo::profile::base::heat::manage_db_purge: {get_param: HeatEnableDBPurge}
-            heat::database_connection:
+            heat::db::database_connection:
               make_url:
                 scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
                 username: heat
diff --git a/deployment/ironic/ironic-base-puppet.yaml b/deployment/ironic/ironic-base-puppet.yaml
index 5c659eac1c..f5bb0e153e 100644
--- a/deployment/ironic/ironic-base-puppet.yaml
+++ b/deployment/ironic/ironic-base-puppet.yaml
@@ -78,7 +78,7 @@ outputs:
     value:
       service_name: ironic_base
       config_settings:
-        ironic::database_connection:
+        ironic::db::database_connection:
           make_url:
             scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
             username: ironic
diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml
index e5d775735b..f7f5ba1285 100644
--- a/deployment/keystone/keystone-container-puppet.yaml
+++ b/deployment/keystone/keystone-container-puppet.yaml
@@ -448,7 +448,7 @@ outputs:
           - if:
             - cors_allowed_origin_set
             - keystone::cors::allowed_origin: {get_param: KeystoneCorsAllowedOrigin}
-          - keystone::database_connection:
+          - keystone::db::database_connection:
               make_url:
                 scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
                 username: keystone
diff --git a/deployment/nova/nova-apidb-client-puppet.yaml b/deployment/nova/nova-apidb-client-puppet.yaml
index cd04bdceb4..ff5cc9e926 100644
--- a/deployment/nova/nova-apidb-client-puppet.yaml
+++ b/deployment/nova/nova-apidb-client-puppet.yaml
@@ -42,7 +42,7 @@ outputs:
     description: Role data for the Nova base service.
     value:
       config_settings:
-        nova::api_database_connection:
+        nova::db::api_database_connection:
           make_url:
             scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
             username: nova_api
diff --git a/deployment/nova/nova-db-client-puppet.yaml b/deployment/nova/nova-db-client-puppet.yaml
index 2c019b9632..a4efe12088 100644
--- a/deployment/nova/nova-db-client-puppet.yaml
+++ b/deployment/nova/nova-db-client-puppet.yaml
@@ -42,7 +42,7 @@ outputs:
     description: Role data for the Nova base service.
     value:
       config_settings:
-        nova::database_connection:
+        nova::db::database_connection:
           make_url:
             scheme: {get_param: [EndpointMap, MysqlCellInternal, protocol]}
             username: nova