Skip to content

Commit 5c1c51e

Browse files
committed
Fix self requiring on role resource
This was causing chaining statements with resource collectors not to work for some reason.
1 parent a6165a5 commit 5c1c51e

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

manifests/server/role.pp

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@
4747
psql_path => $psql_path,
4848
connect_settings => $connect_settings,
4949
cwd => $module_workdir,
50-
require => [
51-
Postgresql_psql["CREATE ROLE ${username} ENCRYPTED PASSWORD ****"],
52-
Class['postgresql::server'],
53-
],
5450
}
5551

5652
if $ensure == 'present' {
@@ -76,39 +72,47 @@
7672
}
7773

7874
postgresql_psql {"ALTER ROLE \"${username}\" ${superuser_sql}":
79-
unless => "SELECT 1 FROM pg_roles WHERE rolname = '${username}' AND rolsuper = ${superuser}",
75+
unless => "SELECT 1 FROM pg_roles WHERE rolname = '${username}' AND rolsuper = ${superuser}",
76+
require => Postgresql_psql["CREATE ROLE ${username} ENCRYPTED PASSWORD ****"],
8077
}
8178

8279
postgresql_psql {"ALTER ROLE \"${username}\" ${createdb_sql}":
83-
unless => "SELECT 1 FROM pg_roles WHERE rolname = '${username}' AND rolcreatedb = ${createdb}",
80+
unless => "SELECT 1 FROM pg_roles WHERE rolname = '${username}' AND rolcreatedb = ${createdb}",
81+
require => Postgresql_psql["CREATE ROLE ${username} ENCRYPTED PASSWORD ****"],
8482
}
8583

8684
postgresql_psql {"ALTER ROLE \"${username}\" ${createrole_sql}":
87-
unless => "SELECT 1 FROM pg_roles WHERE rolname = '${username}' AND rolcreaterole = ${createrole}",
85+
unless => "SELECT 1 FROM pg_roles WHERE rolname = '${username}' AND rolcreaterole = ${createrole}",
86+
require => Postgresql_psql["CREATE ROLE ${username} ENCRYPTED PASSWORD ****"],
8887
}
8988

9089
postgresql_psql {"ALTER ROLE \"${username}\" ${login_sql}":
91-
unless => "SELECT 1 FROM pg_roles WHERE rolname = '${username}' AND rolcanlogin = ${login}",
90+
unless => "SELECT 1 FROM pg_roles WHERE rolname = '${username}' AND rolcanlogin = ${login}",
91+
require => Postgresql_psql["CREATE ROLE ${username} ENCRYPTED PASSWORD ****"],
9292
}
9393

9494
postgresql_psql {"ALTER ROLE \"${username}\" ${inherit_sql}":
95-
unless => "SELECT 1 FROM pg_roles WHERE rolname = '${username}' AND rolinherit = ${inherit}",
95+
unless => "SELECT 1 FROM pg_roles WHERE rolname = '${username}' AND rolinherit = ${inherit}",
96+
require => Postgresql_psql["CREATE ROLE ${username} ENCRYPTED PASSWORD ****"],
9697
}
9798

9899
if(versioncmp($version, '9.1') >= 0) {
99100
if $replication_sql == '' {
100101
postgresql_psql {"ALTER ROLE \"${username}\" NOREPLICATION":
101-
unless => "SELECT 1 FROM pg_roles WHERE rolname = '${username}' AND rolreplication = ${replication}",
102+
unless => "SELECT 1 FROM pg_roles WHERE rolname = '${username}' AND rolreplication = ${replication}",
103+
require => Postgresql_psql["CREATE ROLE ${username} ENCRYPTED PASSWORD ****"],
102104
}
103105
} else {
104106
postgresql_psql {"ALTER ROLE \"${username}\" ${replication_sql}":
105-
unless => "SELECT 1 FROM pg_roles WHERE rolname = '${username}' AND rolreplication = ${replication}",
107+
unless => "SELECT 1 FROM pg_roles WHERE rolname = '${username}' AND rolreplication = ${replication}",
108+
require => Postgresql_psql["CREATE ROLE ${username} ENCRYPTED PASSWORD ****"],
106109
}
107110
}
108111
}
109112

110113
postgresql_psql {"ALTER ROLE \"${username}\" CONNECTION LIMIT ${connection_limit}":
111-
unless => "SELECT 1 FROM pg_roles WHERE rolname = '${username}' AND rolconnlimit = ${connection_limit}",
114+
unless => "SELECT 1 FROM pg_roles WHERE rolname = '${username}' AND rolconnlimit = ${connection_limit}",
115+
require => Postgresql_psql["CREATE ROLE ${username} ENCRYPTED PASSWORD ****"],
112116
}
113117

114118
if $password_hash and $update_password {
@@ -122,6 +126,7 @@
122126
command => "ALTER ROLE \"${username}\" ${password_sql}",
123127
unless => "SELECT 1 FROM pg_shadow WHERE usename = '${username}' AND passwd = '${pwd_hash_sql}'",
124128
environment => $environment,
129+
require => Postgresql_psql["CREATE ROLE ${username} ENCRYPTED PASSWORD ****"],
125130
}
126131
}
127132
} else {

0 commit comments

Comments
 (0)