Skip to content

Commit e83c741

Browse files
committed
PE-38801 Warning text moved to applicable plans
1 parent b4574c7 commit e83c741

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

REFERENCE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
* [`download`](#download): Download a file using curl
6565
* [`enable_replica`](#enable_replica): Execute the enable replica puppet command
6666
* [`filesize`](#filesize): Return the size of a file in bytes
67-
* [`get_group_rules`](#get_group_rules): Run on a PE primary node to return the rules currently applied to the PE Infrastructure Agent group, along with a warning that they will be o
67+
* [`get_group_rules`](#get_group_rules): Run on a PE primary node to return the rules currently applied to the PE Infrastructure Agent group
6868
* [`get_peadm_config`](#get_peadm_config): Run on a PE primary node to return the currently configured PEAdm parameters
6969
* [`get_psql_version`](#get_psql_version): Run on a PE PSQL node to return the major version of the PSQL server currently installed
7070
* [`infrastatus`](#infrastatus): Runs puppet infra status and returns the output
@@ -1188,7 +1188,7 @@ Path to the file to return the size of
11881188

11891189
### <a name="get_group_rules"></a>`get_group_rules`
11901190

1191-
Run on a PE primary node to return the rules currently applied to the PE Infrastructure Agent group, along with a warning that they will be overwritten
1191+
Run on a PE primary node to return the rules currently applied to the PE Infrastructure Agent group
11921192

11931193
**Supports noop?** false
11941194

plans/convert.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@
261261
# the existing groups are correct enough to function until the upgrade is
262262
# performed.
263263
if (versioncmp($pe_version, '2019.7.0') >= 0) {
264+
out::message('WARNING: The following existing rules on the PE Infrastructure Agent group will be overwritten with default values:')
264265
run_task('peadm::get_group_rules', $primary_target)
265266

266267
apply($primary_target) {

plans/upgrade.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@
326326
default => $primary_postgresql_target.peadm::certname(),
327327
}
328328

329+
out::message('WARNING: The following existing rules on the PE Infrastructure Agent group will be overwritten with default values:')
329330
run_task('peadm::get_group_rules', $primary_target)
330331

331332
apply($primary_target) {

tasks/get_group_rules.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"description": "Run on a PE primary node to return the rules currently applied to the PE Infrastructure Agent group, along with a warning that they will be overwritten",
2+
"description": "Run on a PE primary node to return the rules currently applied to the PE Infrastructure Agent group",
33
"parameters": { },
44
"input_method": "stdin"
55
}

tasks/get_group_rules.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ class GetInfrastructureAgentGroupRules
1010
def execute!
1111
infrastructure_agent_group = groups.find { |obj| obj['name'] == 'PE Infrastructure Agent' }
1212
if infrastructure_agent_group
13-
puts 'WARNING: The following existing rules on the PE Infrastructure Agent group will be overwritten with default values:'
1413
puts JSON.pretty_generate(infrastructure_agent_group['rule'])
1514
else
1615
puts JSON.pretty_generate({ 'error' => 'PE Infrastructure Agent group does not exist' })

0 commit comments

Comments
 (0)