Skip to content

Commit 4bbbcac

Browse files
committed
Integration testing PE version update
1 parent 7c0b39e commit 4bbbcac

File tree

2 files changed

+22
-17
lines changed

2 files changed

+22
-17
lines changed

plans/acceptance/pe_agent.pp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,18 @@
99
$puppet_server = get_targets('*').filter |$n| { $n.vars['role'] == 'ntpserver' }
1010
$puppet_agent = get_targets('*').filter |$n| { $n.vars['role'] == 'ntpclient' }
1111

12+
# Trigger PE to configure the master and stage agent packages
13+
run_command(
14+
'/opt/puppetlabs/puppet/bin/puppet infrastructure configure',
15+
$puppet_server,
16+
)
17+
18+
# Apply the repo class for Ubuntu 22.04
19+
run_command(
20+
'puppet apply -e "include pe_repo::platform::ubuntu_2204_amd64"',
21+
$puppet_server,
22+
)
23+
1224
# install pe server
1325
run_plan(
1426
'deploy_pe::provision_agent',

plans/acceptance/pe_server.pp

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
1-
# @summary Install PE Server
2-
#
3-
# Install PE Server
4-
#
5-
# @example
6-
# ntp::acceptance::pe_server
71
plan ntp::acceptance::pe_server(
8-
Optional[String] $version = '2021.7.9',
9-
Optional[Hash] $pe_settings = { password => 'puppetlabs' }
2+
TargetSpec $pe_master = get_targets('pe_master'),
103
) {
11-
#identify pe server node
12-
$puppet_server = get_targets('*').filter |$n| { $n.vars['role'] == 'ntpserver' }
4+
run_plan('deploy_pe::provision_master', targets => $pe_master)
135

14-
# install pe server
15-
run_plan(
16-
'deploy_pe::provision_master',
17-
$puppet_server,
18-
'version' => $version,
19-
'pe_settings' => $pe_settings
20-
)
6+
apply($pe_master) {
7+
class { 'pe_repo':
8+
enable_bulk_pluginsync => false,
9+
enable_windows_bulk_pluginsync => false,
10+
}
11+
}
12+
13+
run_command('puppet apply -e "include pe_repo::platform::ubuntu_2204_amd64"', $pe_master)
2114
}

0 commit comments

Comments
 (0)