airship/maas
Code Issues Proposed changes

Set MAAS internal proxy to 31800

Browse Source 
Looks like new version of MAAS has fixed long standing bug
https://bugs.launchpad.net/maas/+bug/1779712

This will match internal MAAS ports to NodePort.

Change-Id: I639a4c492eb80545c69fd132d3b2dc4cca524933
This commit is contained in:
Kaspars Skels
2018-10-19 01:01:23 -05:00
committed by Scott Hussey
parent cdfb1737da
commit e53cb2d237
6 changed files with 6 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
images/maas-region-controller/2.3_proxy_port.patch
View File

@@ -1,36 +0,0 @@
diff --git a/src/maasserver/compose_preseed.py b/src/maasserver/compose_preseed.py
index f24b10f..f030469 100644
--- a/src/maasserver/compose_preseed.py
+++ b/src/maasserver/compose_preseed.py
@@ -8,7 +8,7 @@ __all__ = [
]
from datetime import timedelta
-from urllib.parse import urlencode
+from urllib.parse import urlencode, urlparse
from maasserver.clusterrpc.osystems import get_preseed_data
from maasserver.enum import (
@@ -17,6 +17,7 @@ from maasserver.enum import (
PRESEED_TYPE,
)
from maasserver.models import PackageRepository
+from maasserver.config import RegionConfiguration
from maasserver.models.config import Config
from maasserver.server_address import get_maas_facing_server_host
from maasserver.utils import absolute_reverse
@@ -43,11 +44,11 @@ def get_apt_proxy(rack_controller=None, default_region_ip=None):
else:
maas_proxy_port = Config.objects.get_config("maas_proxy_port")
if not maas_proxy_port:
- maas_proxy_port = 8000
+ maas_proxy_port = 31800
url = "http://:%d/" % maas_proxy_port
- return compose_URL(
- url, get_maas_facing_server_host(
- rack_controller, default_region_ip=default_region_ip))
+ with RegionConfiguration.open() as config:
+ maas_url = config.maas_url
+ return compose_URL(url, urlparse(maas_url).hostname)
else:
return None

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

@@ -54,12 +54,10 @@ RUN apt-get download maas-region-controller=$MAAS_VERSION && \
pg_dropcluster --stop 9.5 main
# 2.3 workarounds
COPY 2.3_proxy_port.patch /tmp/2.3_proxy_port.patch
COPY 2.3_route.patch /tmp/2.3_route.patch
COPY 2.3_kernel_package.patch /tmp/2.3_kernel_package.patch
COPY 2.3_bios_grub_partition.patch /tmp/2.3_bios_grub_partition.patch
COPY 2.3_bios_grub_preseed.patch /tmp/2.3_bios_grub_preseed.patch
RUN cd /usr/lib/python3/dist-packages/maasserver && patch compose_preseed.py < /tmp/2.3_proxy_port.patch
RUN cd /usr/lib/python3/dist-packages/maasserver && patch preseed_network.py < /tmp/2.3_route.patch
RUN cd /usr/lib/python3/dist-packages/maasserver && patch preseed.py < /tmp/2.3_kernel_package.patch
RUN cd /usr/lib/python3/dist-packages/maasserver/models && patch partition.py < /tmp/2.3_bios_grub_partition.patch