airship/maas
Code Issues Proposed changes

Fix for 2.3 metadata_url bug

Browse Source 
This is a temporary workaround patch
to resolve https://bugs.launchpad.net/maas/+bug/1743005

- Update chart to point at patched image sthussey/maas-region:2.3_patch

Change-Id: I8c631da1b4b555523485d666cea22cb2dbaeff26
This commit is contained in:
Scott Hussey 2018-01-12 12:23:43 -06:00
parent 2ad09ad90a
commit 8b29fb6bdf
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/maas/values.yaml
View File

@ -71,7 +71,7 @@ images:
db_init: docker.io/postgres:9.5
db_sync: sthussey/maas-region-controller:2.3
maas_rack: sthussey/maas-rack-controller:2.3
maas_region: sthussey/maas-region-controller:2.3
maas_region: sthussey/maas-region:2.3_patch
bootstrap: sthussey/maas-region-controller:2.3
export_api_key: sthussey/maas-region-controller:2.3
maas_cache: quay.io/attcomdev/maas-cache:master

18
images/maas-region-controller/2.3_nat_fix.patch Normal file
View File

@ -0,0 +1,18 @@
diff --git a/src/maasserver/utils/__init__.py b/src/maasserver/utils/__init__.py
index 1c58859..f8e673d 100644
--- a/src/maasserver/utils/__init__.py
+++ b/src/maasserver/utils/__init__.py
@@ -66,8 +66,11 @@ def absolute_reverse(
if not base_url:
with RegionConfiguration.open() as config:
base_url = config.maas_url
- if default_region_ip is not None:
- base_url = compose_URL(base_url, default_region_ip)
+ # NOTE(sh8121att)
+ # Commenting out as workaround to
+ # https://bugs.launchpad.net/maas/+bug/1743005
+ #if default_region_ip is not None:
+ # base_url = compose_URL(base_url, default_region_ip)
url = urljoin(base_url, reverse(view_name, *args, **kwargs))
if query is not None:
url += '?%s' % urlencode(query, doseq=True)

5
images/maas-region-controller/Dockerfile
View File

@ -50,8 +50,9 @@ RUN apt-get download maas-region-controller=$MAAS_VERSION && \
dpkg -i maas-region-controller.deb && \
pg_dropcluster --stop 9.5 main
# potentially used to calculate cidrs
# RUN pip3 install netaddr
# 2.3 workaround
COPY 2.3_nat_fix.patch /tmp/2.3_nat_fix.patch
RUN cd /usr/lib/python3/dist-packages/maasserver/utils && patch __init__.py < /tmp/2.3_nat_fix.patch
# initalize systemd
CMD ["/sbin/init"]