openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Ubuntu: Switch to Epoxy" into stable/2025.1

Browse Source
This commit is contained in:
Zuul
2025-04-22 17:23:12 +00:00
committed by Gerrit Code Review
parent c40c78037d 23c28d93ff
commit 33ceb8c924
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/repos.pp
View File

@@ -6,10 +6,8 @@ class openstack_integration::repos {
'Ubuntu': { 'Ubuntu': {
include apt include apt
class { 'openstack_extras::repo::debian::ubuntu': class { 'openstack_extras::repo::debian::ubuntu':
release => 'caracal', release => 'epoxy',
# TODO(tkajinam): Switch to UCA once openstackclient in Dalmatian manage_uca => true,
# is updated. See https://bugs.launchpad.net/bugs/2097764 .
manage_uca => false,
package_require => true, package_require => true,
uca_location => pick($facts['uca_mirror_host'], 'http://ubuntu-cloud.archive.canonical.com/ubuntu'), uca_location => pick($facts['uca_mirror_host'], 'http://ubuntu-cloud.archive.canonical.com/ubuntu'),
} }
@@ -17,7 +15,7 @@ class openstack_integration::repos {
'Debian': { 'Debian': {
include apt include apt
class { 'openstack_extras::repo::debian::debian': class { 'openstack_extras::repo::debian::debian':
release => 'caracal', release => 'epoxy',
package_require => true, package_require => true,
} }
} }