Skip to content

Commit e5f68d8

Browse files
authored
Merge pull request #331 from vchepkov/variables
fix variable notation
2 parents 1940136 + b8c1ebe commit e5f68d8

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

Diff for: plans/subplans/db_populate.pp

+6-7
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,18 @@
6565
sslcert=/opt/puppetlabs/server/data/pg_certs/_local.cert.pem
6666
sslkey=/opt/puppetlabs/server/data/pg_certs/_local.private_key.pem
6767
sslrootcert=/etc/puppetlabs/puppet/ssl/certs/ca.pem"
68-
| - PGBASE
69-
run_command(${pg_basebackup}, ${destination_target})
68+
| - PGBASE
69+
run_command($pg_basebackup, $destination_target)
7070

7171
# Delete the saved certs, they'll be properly re-populated by an agent run
72-
run_command('rm -rf /opt/puppetlabs/server/data/pg_certs', ${destination_target})
72+
run_command('rm -rf /opt/puppetlabs/server/data/pg_certs', $destination_target)
7373

7474
# Start pe-postgresql.service
75-
run_command('systemctl start pe-postgresql.service', ${destination_target})
75+
run_command('systemctl start pe-postgresql.service', $destination_target)
7676

7777
# Delete the previously add replication rules to prevent Puppet restarting
7878
# thing later
79-
apply(${source_target}) {
79+
apply($source_target) {
8080
file_line { 'replication-pe-ha-replication-map':
8181
ensure => absent,
8282
path => "/opt/puppetlabs/server/data/postgresql/${psql_version}/data/pg_ident.conf",
@@ -95,8 +95,7 @@
9595
}
9696

9797
# Reload pe-postgresql to revoke replication rules
98-
run_command('systemctl reload pe-postgresql.service', ${source_target})
98+
run_command('systemctl reload pe-postgresql.service', $source_target)
9999

100100
return("Population of ${$destination_target.peadm::certname()} with data from s${$source_target.peadm::certname()} succeeded.")
101101
}
102-

0 commit comments

Comments
 (0)