Merge pull request #1455 from SimonHoenscheid/unique_anchors

bastelfreak · web-flow · commit 5a3246266825 · 2023-07-03T16:50:30.000+02:00
Make anchors in defined resources unique
diff --git a/manifests/server/instance/late_initdb.pp b/manifests/server/instance/late_initdb.pp
@@ -38,6 +38,6 @@
       WHERE datname = 'template1'",
     unless  => "SELECT datname FROM pg_database WHERE
       datname = 'template1' AND encoding = pg_char_to_encoding('${encoding}')",
-    before  => Anchor['postgresql::server::service::end'],
+    before  => Anchor["postgresql::server::service::end::${name}"],
   }
 }
diff --git a/manifests/server/instance/service.pp b/manifests/server/instance/service.pp
@@ -25,7 +25,7 @@
   Variant[String[1], Stdlib::Absolutepath]     $psql_path        = $postgresql::server::psql_path,
   Hash                                         $connect_settings = $postgresql::server::default_connect_settings,
 ) {
-  anchor { 'postgresql::server::service::begin': }
+  anchor { "postgresql::server::service::begin::${name}": }
 
   if $service_manage {
     service { 'postgresqld':
@@ -52,11 +52,11 @@
         tries            => 60,
         psql_path        => $psql_path,
         require          => Service['postgresqld'],
-        before           => Anchor['postgresql::server::service::end'],
+        before           => Anchor["postgresql::server::service::end::${name}"],
       }
       Postgresql::Server::Database <| title == $default_database |> -> Postgresql_conn_validator['validate_service_is_running']
     }
   }
 
-  anchor { 'postgresql::server::service::end': }
+  anchor { "postgresql::server::service::end::${name}": }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,6 @@`
`38`	`38`	`WHERE datname = 'template1'",`
`39`	`39`	`unless => "SELECT datname FROM pg_database WHERE`
`40`	`40`	`datname = 'template1' AND encoding = pg_char_to_encoding('${encoding}')",`
`41`		`- before => Anchor['postgresql::server::service::end'],`
	`41`	`+ before => Anchor["postgresql::server::service::end::${name}"],`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`Variant[String[1], Stdlib::Absolutepath] $psql_path = $postgresql::server::psql_path,`
`26`	`26`	`Hash $connect_settings = $postgresql::server::default_connect_settings,`
`27`	`27`	`) {`
`28`		`- anchor { 'postgresql::server::service::begin': }`
	`28`	`+ anchor { "postgresql::server::service::begin::${name}": }`
`29`	`29`
`30`	`30`	`if $service_manage {`
`31`	`31`	`service { 'postgresqld':`
`@@ -52,11 +52,11 @@`
`52`	`52`	`tries => 60,`
`53`	`53`	`psql_path => $psql_path,`
`54`	`54`	`require => Service['postgresqld'],`
`55`		`- before => Anchor['postgresql::server::service::end'],`
	`55`	`+ before => Anchor["postgresql::server::service::end::${name}"],`
`56`	`56`	`}`
`57`	`57`	`Postgresql::Server::Database <\| title == $default_database \|> -> Postgresql_conn_validator['validate_service_is_running']`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`- anchor { 'postgresql::server::service::end': }`
	`61`	`+ anchor { "postgresql::server::service::end::${name}": }`
`62`	`62`	`}`