From d29d9313d77edf894c504303ca1169928ff97750 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Sun, 17 Jan 2021 02:38:37 -0600 Subject: [PATCH] allow create-repo-list to be run without six Some distros (gentoo) do not come with six in the base image (stage3), it is installed later in the image build. Use the native urlopen/URLError if the six version is not available. Change-Id: Id1c52aa17e565c16369645508e43e4f485defa66 --- .../openstack-repos/extra-data.d/50-create-repo-list | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nodepool/elements/openstack-repos/extra-data.d/50-create-repo-list b/nodepool/elements/openstack-repos/extra-data.d/50-create-repo-list index 7de9d7bedb..8423a6012e 100755 --- a/nodepool/elements/openstack-repos/extra-data.d/50-create-repo-list +++ b/nodepool/elements/openstack-repos/extra-data.d/50-create-repo-list @@ -19,8 +19,14 @@ import os import yaml -from six.moves.urllib.request import urlopen -from six.moves.urllib.error import URLError +try: + from six.moves.urllib.request import urlopen +except ImportError: + from urllib.request import urlopen +try: + from six.moves.urllib.error import URLError +except ImportError: + from urllib.request import URLError URL = ('https://opendev.org/openstack/project-config/' 'raw/gerrit/projects.yaml')