From b7396be571b3870b6e484a498c4748b73c9cb0bc Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 28 Feb 2022 01:01:04 +0900 Subject: [PATCH] Replace removed keystone::database_connection These parameters have been removed by [1]. [1] 845eb1c9a1ae492675e299d7f1f6e0287842b1c5 Change-Id: I2c57ba9ab63a27b4f502956e47da25b2b9f544c6 --- examples/apache_dropin.pp | 10 ++++++---- examples/apache_with_paths.pp | 11 +++++++---- examples/k2k_sp_shib.pp | 11 +++++++---- examples/ldap_backend.pp | 5 ++++- examples/v3_basic.pp | 8 +++++--- examples/v3_domain_configuration.pp | 4 +++- 6 files changed, 32 insertions(+), 17 deletions(-) diff --git a/examples/apache_dropin.pp b/examples/apache_dropin.pp index a1a683bcc..fa2b6eae7 100644 --- a/examples/apache_dropin.pp +++ b/examples/apache_dropin.pp @@ -24,11 +24,13 @@ class { 'mysql::server': } class { 'keystone::db::mysql': password => 'keystone', } -class { 'keystone': - debug => true, +class { 'keystone::db': database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone', - catalog_type => 'sql', - enabled => false, +} +class { 'keystone': + debug => true, + catalog_type => 'sql', + enabled => false, } class { 'keystone::bootstrap': password => 'ChangeMe', diff --git a/examples/apache_with_paths.pp b/examples/apache_with_paths.pp index b92cd8543..099a5a7f8 100644 --- a/examples/apache_with_paths.pp +++ b/examples/apache_with_paths.pp @@ -24,11 +24,14 @@ class { 'mysql::server': } class { 'keystone::db::mysql': password => 'keystone', } +class { 'keystone::db': + database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone', +} + class { 'keystone': - debug => true, - database_connection => 'mysql://keystone_admin:keystone@127.0.0.1/keystone', - catalog_type => 'sql', - enabled => true, + debug => true, + catalog_type => 'sql', + enabled => true, } class { 'keystone::bootstrap': password => 'ChangeMe', diff --git a/examples/k2k_sp_shib.pp b/examples/k2k_sp_shib.pp index e1903d167..e03d088f5 100644 --- a/examples/k2k_sp_shib.pp +++ b/examples/k2k_sp_shib.pp @@ -41,11 +41,14 @@ class { 'keystone::db::mysql': password => 'keystone', } -class { 'keystone': - debug => true, +class { 'keystone::db': database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone', - catalog_type => 'sql', - enabled => false, +} + +class { 'keystone': + debug => true, + catalog_type => 'sql', + enabled => false, } class { 'keystone::bootstrap': diff --git a/examples/ldap_backend.pp b/examples/ldap_backend.pp index 9544fbd39..00e792053 100644 --- a/examples/ldap_backend.pp +++ b/examples/ldap_backend.pp @@ -1,6 +1,9 @@ +class { 'keystone::db': + database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone', +} + class { 'keystone': debug => true, - database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone', enabled => true, # helper for using domains using_domain_config => true diff --git a/examples/v3_basic.pp b/examples/v3_basic.pp index 06600c0d1..6314d7ceb 100644 --- a/examples/v3_basic.pp +++ b/examples/v3_basic.pp @@ -5,10 +5,12 @@ class { 'mysql::server': } class { 'keystone::db::mysql': password => 'keystone', } -class { 'keystone': - debug => true, +class { 'keystone::db': database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone', - enabled => true, +} +class { 'keystone': + debug => true, + enabled => true, } class { 'keystone::bootstrap': password => 'a_big_secret', diff --git a/examples/v3_domain_configuration.pp b/examples/v3_domain_configuration.pp index 3d340ad17..75672943a 100644 --- a/examples/v3_domain_configuration.pp +++ b/examples/v3_domain_configuration.pp @@ -4,9 +4,11 @@ class { 'mysql::server': } class { 'keystone::db::mysql': password => 'keystone', } +class { 'keystone::db': + database_connection => 'mysql://keystone:keystone@127.0.0.1/keystone', +} class { 'keystone': debug => true, - database_connection => 'mysql://keystone:keystone@192.168.1.1/keystone', enabled => true, # The domain configuration setup at keystone level using_domain_config => true,