Skip to content

Commit be5cb98

Browse files
authored
Merge pull request #123 from puppetlabs/informational-messages
Add informational messages to upgrade plan
2 parents a475b88 + eb17236 commit be5cb98

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Documentation and README update
88
### Features
99

1010
- Added parameters to configure compiler pool addresses for the A and B availability groups. These are used in large and extra large architectures.
11+
- Add basic informational messages to upgrade plan output, to communicate when different stages of the upgrade begin.
1112

1213
### Bugfixes
1314

plans/upgrade.pp

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
$puppetdb_database_replica_target,
6868
])
6969

70+
message::out(@(EOL)) ######################################################
71+
### UPGRADE STAGE: INFORMATION GATHERING
72+
| EOL
73+
7074
# Gather trusted facts from all systems
7175
$cert_extensions = run_task('peadm::trusted_facts', $all_targets).reduce({}) |$memo,$result| {
7276
$memo + { $result.target.name => $result['extensions'] }
@@ -103,9 +107,9 @@
103107
== $cert_extensions[$master_replica_target[0].name][peadm::oid('peadm_availability_group')])
104108
}
105109

106-
###########################################################################
107-
# PREPARATION
108-
###########################################################################
110+
message::out(@(EOL)) ###########################################
111+
### UPGRADE STAGE: PREPARATION
112+
| EOL
109113

110114
# Support for running over the orchestrator transport relies on Bolt being
111115
# executed from the master using the local transport. For now, fail the plan
@@ -137,9 +141,9 @@
137141
# not all pxp-agents have, the built-in service task does not work over pcp.
138142
run_command('systemctl stop puppet', $all_targets)
139143

140-
###########################################################################
141-
# UPGRADE MASTER SIDE
142-
###########################################################################
144+
message::out(@(EOL)) ###########################################
145+
### UPGRADE STAGE: UPGRADE MASTER SIDE
146+
| EOL
143147

144148
# Shut down PuppetDB on CMs that use the PM's PDB PG. Use run_command instead
145149
# of run_task(service, ...) so that upgrading from 2018.1 works over PCP.
@@ -210,9 +214,9 @@
210214
token_file => $token_file,
211215
)
212216

213-
###########################################################################
214-
# UPGRADE REPLICA SIDE
215-
###########################################################################
217+
message::out(@(EOL)) ######################################################
218+
### UPGRADE STAGE: UPGRADE REPLICA SIDE
219+
| EOL
216220

217221
# Shut down PuppetDB on CMs that use the replica's PDB PG. Use run_command
218222
# instead of run_task(service, ...) so that upgrading from 2018.1 works
@@ -249,9 +253,9 @@
249253
token_file => $token_file,
250254
)
251255

252-
###########################################################################
253-
# FINALIZE UPGRADE
254-
###########################################################################
256+
message::out(@(EOL)) ######################################################
257+
### UPGRADE STAGE: FINALIZE UPGRADE
258+
| EOL
255259

256260
# Ensure Puppet running on all infrastructure targets
257261
run_task('service', $all_targets,

0 commit comments

Comments
 (0)