From 0c6f262978cd700f245e2b6a1ad6e59d7431ad4f Mon Sep 17 00:00:00 2001 From: Angie Wang Date: Fri, 11 Oct 2019 11:56:42 -0400 Subject: [PATCH] Strip out port from the alternative registry url If the alternative registry url contains a port, it's stripped out during Ansible bootstrap. Strip it out from armada image too. Tested: - apply application successfully with private registry that has port in the address Depends-On: https://review.opendev.org/687655 Change-Id: I12814790f0c61247704dbf4f55a7e6620ec5849e Closes-Bug: #1847409 Signed-off-by: Angie Wang --- sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py b/sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py index 9f5003b375..fae00f3cf0 100644 --- a/sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py +++ b/sysinv/sysinv/sysinv/sysinv/conductor/kube_app.py @@ -2589,6 +2589,8 @@ class DockerHelper(object): if quay_registry_url: quay_url = quay_registry_url[0].value + # If registry url has a port, strip it out + quay_url = re.sub(r':[0-9]+', '', quay_url) else: quay_url = constants.DEFAULT_DOCKER_QUAY_REGISTRY