Skip to content

Commit 6ec0f1d

Browse files
unique anchors for postgres_instances
1 parent f8f3d55 commit 6ec0f1d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

manifests/server/instance/late_initdb.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@
3838
WHERE datname = 'template1'",
3939
unless => "SELECT datname FROM pg_database WHERE
4040
datname = 'template1' AND encoding = pg_char_to_encoding('${encoding}')",
41-
before => Anchor['postgresql::server::service::end'],
41+
before => Anchor["postgresql::server::service::end::${name}"],
4242
}
4343
}

manifests/server/instance/service.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path,
2626
Hash $connect_settings = $postgresql::server::default_connect_settings,
2727
) {
28-
anchor { 'postgresql::server::service::begin': }
28+
anchor { "postgresql::server::service::begin::${name}": }
2929

3030
if $service_manage {
3131
service { 'postgresqld':
@@ -52,11 +52,11 @@
5252
tries => 60,
5353
psql_path => $psql_path,
5454
require => Service['postgresqld'],
55-
before => Anchor['postgresql::server::service::end'],
55+
before => Anchor["postgresql::server::service::end::${name}"],
5656
}
5757
Postgresql::Server::Database <| title == $default_database |> -> Postgresql_conn_validator['validate_service_is_running']
5858
}
5959
}
6060

61-
anchor { 'postgresql::server::service::end': }
61+
anchor { "postgresql::server::service::end::${name}": }
6262
}

0 commit comments

Comments
 (0)