openstack/puppet-ironic
Code Issues Proposed changes

Create separate dbsync anchors for ironic-inspector

Browse Source 
... to make the two implementations for ironic and ironic-inspector
more consistent.

Change-Id: I62290eba14785a00dad15918ce63cea0eed8fcac
This commit is contained in:
Takashi Kajinami
2023-11-20 16:11:01 +09:00
parent 029df239fc
commit 2b8f21080c
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/db.pp
View File

@@ -67,6 +67,7 @@ class ironic::db (
db_max_retries => $database_db_max_retries, db_max_retries => $database_db_max_retries,
pool_timeout => $database_pool_timeout, pool_timeout => $database_pool_timeout,
mysql_enable_ndb => $mysql_enable_ndb, mysql_enable_ndb => $mysql_enable_ndb,
tag => 'ironic',
} }
} }

10
manifests/deps.pp
View File

@@ -28,7 +28,8 @@ class ironic::deps {
# all db settings should be applied and all packages should be installed # all db settings should be applied and all packages should be installed
# before dbsync starts # before dbsync starts
Oslo::Db<||> -> Anchor['ironic::dbsync::begin'] Oslo::Db<| tag == 'ironic' |> -> Anchor['ironic::dbsync::begin']
Oslo::Db<| tag == 'ironic-inspector' |> -> Anchor['ironic::dbsync::begin']
# ironic-inspector is supported by this module. This service uses a # ironic-inspector is supported by this module. This service uses a
# specific conf file and uses it's own config provider. Split out install # specific conf file and uses it's own config provider. Split out install
@@ -39,7 +40,9 @@ class ironic::deps {
-> anchor { 'ironic-inspector::config::begin': } -> anchor { 'ironic-inspector::config::begin': }
-> Ironic_inspector_config<||> -> Ironic_inspector_config<||>
~> anchor { 'ironic-inspector::config::end': } ~> anchor { 'ironic-inspector::config::end': }
-> anchor { 'ironic-inspector::dbsync::begin': } -> anchor { 'ironic-inspector::db::begin': }
-> anchor { 'ironic-inspector::db::end': }
~> anchor { 'ironic-inspector::dbsync::begin': }
-> anchor { 'ironic-inspector::dbsync::end': } -> anchor { 'ironic-inspector::dbsync::end': }
~> anchor { 'ironic-inspector::service::begin': } ~> anchor { 'ironic-inspector::service::begin': }
~> Service<| tag == 'ironic-inspector-service' |> ~> Service<| tag == 'ironic-inspector-service' |>
@@ -49,9 +52,6 @@ class ironic::deps {
~> Service<| tag == 'ironic-inspector-dnsmasq-service' |> ~> Service<| tag == 'ironic-inspector-dnsmasq-service' |>
~> Anchor['ironic-inspector::service::end'] ~> Anchor['ironic-inspector::service::end']
Anchor['ironic::db::end']
-> Anchor['ironic-inspector::dbsync::begin']
# On any uwsgi config change, we must restart Ironic API. # On any uwsgi config change, we must restart Ironic API.
Anchor['ironic::config::begin'] Anchor['ironic::config::begin']
-> Ironic_api_uwsgi_config<||> -> Ironic_api_uwsgi_config<||>

1
manifests/inspector/db.pp
View File

@@ -67,6 +67,7 @@ class ironic::inspector::db (
max_overflow => $database_max_overflow, max_overflow => $database_max_overflow,
pool_timeout => $database_pool_timeout, pool_timeout => $database_pool_timeout,
mysql_enable_ndb => $mysql_enable_ndb, mysql_enable_ndb => $mysql_enable_ndb,
tag => 'ironic-inspector',
} }
} }

7
manifests/inspector/db/mysql.pp
View File

@@ -54,6 +54,8 @@ class ironic::inspector::db::mysql (
$collate = 'utf8_general_ci', $collate = 'utf8_general_ci',
) { ) {
include ironic::deps
::openstacklib::db::mysql { 'ironic-inspector': ::openstacklib::db::mysql { 'ironic-inspector':
user => $user, user => $user,
password => $password, password => $password,
@@ -64,6 +66,7 @@ class ironic::inspector::db::mysql (
allowed_hosts => $allowed_hosts, allowed_hosts => $allowed_hosts,
} }
::Openstacklib::Db::Mysql['ironic-inspector'] ~> Exec<| title == 'ironic-inspector-dbsync' |> Anchor['ironic-inspector::db::begin']
~> Class['ironic::inspector::db::mysql']
~> Anchor['ironic-inspector::db::end']
} }

7
manifests/inspector/db/postgresql.pp
View File

@@ -32,7 +32,7 @@ class ironic::inspector::db::postgresql(
$privileges = 'ALL', $privileges = 'ALL',
) { ) {
Class['ironic::inspector::db::postgresql'] -> Service<| title == 'ironic-inspector' |> include ironic::deps
::openstacklib::db::postgresql { 'ironic-inspector': ::openstacklib::db::postgresql { 'ironic-inspector':
password => $password, password => $password,
@@ -42,6 +42,7 @@ class ironic::inspector::db::postgresql(
privileges => $privileges, privileges => $privileges,
} }
::Openstacklib::Db::Postgresql['ironic-inspector'] ~> Exec<| title == 'ironic-inspector-dbsync' |> Anchor['ironic-inspector::db::begin']
~> Class['ironic::inspector::db::postgresql']
~> Anchor['ironic-inspector::db::end']
} }