x/packstack
Code Issues Proposed changes

Move database config parameters to separated ::db classes

Browse Source 
The parameters have been removed for heat, ironic, keysonte, manila and
sahara [1]. This patch is moving database_connection to the separated
::db classed for all of them.

[1] https://review.opendev.org/q/topic:cleanup-db-params

Change-Id: Ib0e98d5847e2b589887ab014279bff4bdc650506
This commit is contained in:
Alfredo Moralejo
2022-02-08 09:43:11 +01:00
parent 500e6e6de9
commit 3d4a38a9fc
5 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packstack/puppet/modules/packstack/manifests/heat/rabbitmq.pp
View File

@@ -39,11 +39,14 @@ class packstack::heat::rabbitmq ()
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { 'heat::db':
database_connection => "mysql+pymysql://heat:${heat_rabbitmq_cfg_heat_db_pw}@${heat_rabbitmq_cfg_mariadb_host}/heat",
}
class { 'heat':
keystone_ec2_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
database_connection => "mysql+pymysql://heat:${heat_rabbitmq_cfg_heat_db_pw}@${heat_rabbitmq_cfg_mariadb_host}/heat",
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
kombu_ssl_keyfile => $kombu_ssl_keyfile,
kombu_ssl_certfile => $kombu_ssl_certfile,

5
packstack/puppet/modules/packstack/manifests/ironic/rabbitmq.pp
View File

@@ -27,10 +27,13 @@ class packstack::ironic::rabbitmq ()
debug => true,
}
class { 'ironic::db':
database_connection => "mysql+pymysql://ironic:${ironic_rabbitmq_cfg_ironic_db_pw}@${ironic_rabbitmq_cfg_mariadb_host}/ironic",
}
class { 'ironic':
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
database_connection => "mysql+pymysql://ironic:${ironic_rabbitmq_cfg_ironic_db_pw}@${ironic_rabbitmq_cfg_mariadb_host}/ironic",
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
kombu_ssl_keyfile => $kombu_ssl_keyfile,
kombu_ssl_certfile => $kombu_ssl_certfile,

5
packstack/puppet/modules/packstack/manifests/keystone.pp
View File

@@ -30,8 +30,11 @@ class packstack::keystone ()
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { 'keystone':
class { 'keystone::db':
database_connection => "mysql+pymysql://keystone_admin:${keystone_cfg_ks_db_pw}@${keystone_cfg_mariadb_host}/keystone",
}
class { 'keystone':
token_provider => $keystone_token_provider_str,
enable_fernet_setup => true,
service_name => 'httpd',

5
packstack/puppet/modules/packstack/manifests/manila/rabbitmq.pp
View File

@@ -28,9 +28,12 @@ class packstack::manila::rabbitmq ()
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { 'manila::db':
database_connection => "mysql+pymysql://manila:${db_pw}@${mariadb_host}/manila",
}
class { 'manila':
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
sql_connection => "mysql+pymysql://manila:${db_pw}@${mariadb_host}/manila",
}
}

6
packstack/puppet/modules/packstack/manifests/sahara/rabbitmq.pp
View File

@@ -35,9 +35,11 @@ class packstack::sahara::rabbitmq ()
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { 'sahara::db':
database_connection => "mysql+pymysql://sahara:${sahara_cfg_sahara_db_pw}@${sahara_cfg_sahara_mariadb_host}/sahara",
}
class { 'sahara':
database_connection =>
"mysql+pymysql://sahara:${sahara_cfg_sahara_db_pw}@${sahara_cfg_sahara_mariadb_host}/sahara",
host => hiera('CONFIG_SAHARA_HOST'),
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",