diff --git a/.fixtures.yml b/.fixtures.yml index 59805deb..e4276a53 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,21 +1,23 @@ --- fixtures: forge_modules: - ruby_task_helper: "puppetlabs/ruby_task_helper" - service: "puppetlabs/service" - package: "puppetlabs/package" - reboot: "puppetlabs/reboot" - inifile: "puppetlabs/inifile" + ruby_task_helper: puppetlabs/ruby_task_helper + service: puppetlabs/service + package: puppetlabs/package + reboot: puppetlabs/reboot + inifile: puppetlabs/inifile repositories: - facts: "https://github.com/puppetlabs/puppetlabs-facts.git" - puppet_agent: "https://github.com/puppetlabs/puppetlabs-puppet_agent.git" - provision: "https://github.com/puppetlabs/provision.git" - stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git" - apply_helpers: "https://github.com/puppetlabs/puppetlabs-apply_helpers" - bolt_shim: "https://github.com/puppetlabs/puppetlabs-bolt_shim" - format: "https://github.com/voxpupuli/puppet-format" - container_inventory: "https://gitlab.com/nwops/bolt-container_inventory.git" - node_manager: "https://github.com/puppetlabs/puppetlabs-node_manager.git" + facts: https://github.com/puppetlabs/puppetlabs-facts.git + puppet_agent: https://github.com/puppetlabs/puppetlabs-puppet_agent.git + provision: + repo: https://github.com/puppetlabs/provision.git + ref: v3.0.1 + stdlib: https://github.com/puppetlabs/puppetlabs-stdlib.git + apply_helpers: https://github.com/puppetlabs/puppetlabs-apply_helpers + bolt_shim: https://github.com/puppetlabs/puppetlabs-bolt_shim + format: https://github.com/voxpupuli/puppet-format + container_inventory: https://gitlab.com/nwops/bolt-container_inventory.git + node_manager: https://github.com/puppetlabs/puppetlabs-node_manager.git symlinks: - "peadm": "#{source_dir}" - "peadm_spec": "#{source_dir}/spec/acceptance/peadm_spec" + peadm: '#{source_dir}' + peadm_spec: '#{source_dir}/spec/acceptance/peadm_spec' diff --git a/functions/pe_db_names.pp b/functions/pe_db_names.pp index bc1137ec..514fcc6c 100644 --- a/functions/pe_db_names.pp +++ b/functions/pe_db_names.pp @@ -9,10 +9,20 @@ function peadm::pe_db_names ( 'pe-rbac', ] + $pe_2025_3_or_later = SemVerRange('>= 2025.3.0') $pe_2025_or_later = SemVerRange('>= 2025.0.0') $pe_2023_8_or_later = SemVerRange('>= 2023.8.0') case $pe_ver { + # The infra-assistant was added in 2025.3.0 + $pe_2025_3_or_later: { + $original_db_names + [ + 'pe-hac', + 'pe-patching', + 'pe-infra-assistant', + ] + } + # The patching service was added in 2025.0.0 $pe_2025_or_later: { $original_db_names + [