x/tobiko
Code Issues Proposed changes

Remove internal Red Hat URLs

Browse Source 
Change-Id: I8c056e9ccad132f4ad7d45ab398d7e49a48bf70e
This commit is contained in:
Eduardo Olivares 2023-03-23 10:30:15 +01:00
parent daff0d1ef4
commit 84c7b79181
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tobiko/openstack/stacks/_cirros.py
View File

@ -32,16 +32,10 @@ CONF = config.CONF
CIRROS_IMAGE_VERSION = '0.5.2' CIRROS_IMAGE_VERSION = '0.5.2'
if tobiko.tripleo.has_undercloud(): CIRROS_IMAGE_URL = (
CIRROS_IMAGE_URL = ( 'http://download.cirros-cloud.net/{version}/'
f"http://rhos-qe-mirror-rdu2.usersys.redhat.com/images/cirros-" 'cirros-{version}-x86_64-disk.img').format(
f"{CIRROS_IMAGE_VERSION}-x86_64-disk.img") version=CIRROS_IMAGE_VERSION)
else:
CIRROS_IMAGE_URL = (
'http://download.cirros-cloud.net/{version}/'
'cirros-{version}-x86_64-disk.img').format(
version=CIRROS_IMAGE_VERSION)
class CirrosImageFixture(glance.URLGlanceImageFixture): class CirrosImageFixture(glance.URLGlanceImageFixture):

10
tobiko/openstack/stacks/_redhat.py
View File

@ -27,13 +27,11 @@ LOG = log.getLogger(__name__)
CONF = config.CONF CONF = config.CONF
RHEL_IMAGE_MAJOR_VERSION = '8.4' RHEL_IMAGE_MAJOR_VERSION = '8.4'
RHEL_IMAGE_MINOR_VERSION = '1254' RHEL_IMAGE_MINOR_VERSION = '1313'
RHEL_IMAGE_URL = ('http://download.devel.redhat.com/brewroot/packages/' RHEL_IMAGE_URL = ('https://url.corp.redhat.com/rhel-guest-image-'
f'rhel-guest-image/{RHEL_IMAGE_MAJOR_VERSION}/' f'{RHEL_IMAGE_MAJOR_VERSION.replace(".", "-")}-'
f'{RHEL_IMAGE_MINOR_VERSION}/images/' f'{RHEL_IMAGE_MINOR_VERSION}-x86-64-qcow2')
f'rhel-guest-image-{RHEL_IMAGE_MAJOR_VERSION}-'
f'{RHEL_IMAGE_MINOR_VERSION}.x86_64.qcow2')
def skip_unless_has_rhel_image(): def skip_unless_has_rhel_image():