Skip to content

Commit 2817444

Browse files
abottchenNeil Andersonragingra
authored
(PE-40508) Add infra-assistant to add_database plan (#580)
* (PE-40508) Add infra-assistant to add_database plan Adding the Infra Assistant DB following just as was done with PE Patching in #531. * Pinning provsion to released version Currently issue in main causing problem in peadm ci * Apply Yamlfix format changes. --------- Co-authored-by: Neil Anderson <[email protected]> Co-authored-by: ragingra <[email protected]>
1 parent 255b974 commit 2817444

File tree

2 files changed

+28
-16
lines changed

2 files changed

+28
-16
lines changed

.fixtures.yml

+18-16
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
---
22
fixtures:
33
forge_modules:
4-
ruby_task_helper: "puppetlabs/ruby_task_helper"
5-
service: "puppetlabs/service"
6-
package: "puppetlabs/package"
7-
reboot: "puppetlabs/reboot"
8-
inifile: "puppetlabs/inifile"
4+
ruby_task_helper: puppetlabs/ruby_task_helper
5+
service: puppetlabs/service
6+
package: puppetlabs/package
7+
reboot: puppetlabs/reboot
8+
inifile: puppetlabs/inifile
99
repositories:
10-
facts: "https://github.com/puppetlabs/puppetlabs-facts.git"
11-
puppet_agent: "https://github.com/puppetlabs/puppetlabs-puppet_agent.git"
12-
provision: "https://github.com/puppetlabs/provision.git"
13-
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
14-
apply_helpers: "https://github.com/puppetlabs/puppetlabs-apply_helpers"
15-
bolt_shim: "https://github.com/puppetlabs/puppetlabs-bolt_shim"
16-
format: "https://github.com/voxpupuli/puppet-format"
17-
container_inventory: "https://gitlab.com/nwops/bolt-container_inventory.git"
18-
node_manager: "https://github.com/puppetlabs/puppetlabs-node_manager.git"
10+
facts: https://github.com/puppetlabs/puppetlabs-facts.git
11+
puppet_agent: https://github.com/puppetlabs/puppetlabs-puppet_agent.git
12+
provision:
13+
repo: https://github.com/puppetlabs/provision.git
14+
ref: v3.0.1
15+
stdlib: https://github.com/puppetlabs/puppetlabs-stdlib.git
16+
apply_helpers: https://github.com/puppetlabs/puppetlabs-apply_helpers
17+
bolt_shim: https://github.com/puppetlabs/puppetlabs-bolt_shim
18+
format: https://github.com/voxpupuli/puppet-format
19+
container_inventory: https://gitlab.com/nwops/bolt-container_inventory.git
20+
node_manager: https://github.com/puppetlabs/puppetlabs-node_manager.git
1921
symlinks:
20-
"peadm": "#{source_dir}"
21-
"peadm_spec": "#{source_dir}/spec/acceptance/peadm_spec"
22+
peadm: '#{source_dir}'
23+
peadm_spec: '#{source_dir}/spec/acceptance/peadm_spec'

functions/pe_db_names.pp

+10
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,20 @@ function peadm::pe_db_names (
99
'pe-rbac',
1010
]
1111

12+
$pe_2025_3_or_later = SemVerRange('>= 2025.3.0')
1213
$pe_2025_or_later = SemVerRange('>= 2025.0.0')
1314
$pe_2023_8_or_later = SemVerRange('>= 2023.8.0')
1415

1516
case $pe_ver {
17+
# The infra-assistant was added in 2025.3.0
18+
$pe_2025_3_or_later: {
19+
$original_db_names + [
20+
'pe-hac',
21+
'pe-patching',
22+
'pe-infra-assistant',
23+
]
24+
}
25+
1626
# The patching service was added in 2025.0.0
1727
$pe_2025_or_later: {
1828
$original_db_names + [

0 commit comments

Comments
 (0)