Skip to content

Commit e3d3181

Browse files
committed
fixing issues merge caused
1 parent 2c0d585 commit e3d3181

File tree

3 files changed

+2
-22
lines changed

3 files changed

+2
-22
lines changed

plans/install.pp

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,7 @@
7676
String $token_lifetime = '1y',
7777
) {
7878
# Log parameters for debugging
79-
peadm::log_plan_params({
80-
'primary_host' => $primary_host,
81-
'replica_host' => $replica_host,
82-
'compiler_hosts' => $compiler_hosts,
83-
'legacy_compilers' => $legacy_compilers,
84-
'primary_postgresql_host' => $primary_postgresql_host,
85-
'replica_postgresql_host' => $replica_postgresql_host,
86-
'version' => $version,
87-
})
88-
89-
peadm::assert_supported_bolt_version()
90-
91-
peadm::assert_supported_pe_version($version, $permit_unsafe_versions)
92-
93-
# Log parameters for debugging
94-
peadm::log_plan_params({
79+
peadm::log_plan_parameters({
9580
'primary_host' => $primary_host,
9681
'replica_host' => $replica_host,
9782
'compiler_hosts' => $compiler_hosts,

plans/migrate.pp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@
2424
) {
2525
# Log parameters for debugging
2626
peadm::log_plan_parameters({
27+
'old_primary_host' => $old_primary_host,
2728
'new_primary_host' => $new_primary_host,
2829
'replica_host' => $replica_host,
29-
'compiler_hosts' => $compiler_hosts,
30-
'legacy_compilers' => $legacy_compilers,
3130
'primary_postgresql_host' => $primary_postgresql_host,
3231
'replica_postgresql_host' => $replica_postgresql_host,
3332
'upgrade_version' => $upgrade_version,

plans/replace_failed_postgresql.pp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,9 @@
1616
peadm::log_plan_parameters({
1717
'primary_host' => $primary_host,
1818
'replica_host' => $replica_host,
19-
'compiler_hosts' => $compiler_hosts,
20-
'legacy_compilers' => $legacy_compilers,
2119
'working_postgresql_host' => $working_postgresql_host,
2220
'failed_postgresql_host' => $failed_postgresql_host,
2321
'replacement_postgresql_host' => $replacement_postgresql_host,
24-
'replica_postgresql_host' => $replica_postgresql_host,
25-
'version' => $version,
2622
})
2723

2824
$all_hosts = peadm::flatten_compact([

0 commit comments

Comments
 (0)