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