From 205c9e64ab5b2a8065aa378d0d5d3e0243843bdc Mon Sep 17 00:00:00 2001 From: "Sphicas, Phil (ps3910)" Date: Sat, 5 Oct 2019 14:07:40 -0700 Subject: [PATCH] trivial: maas-region container patches file twice Avoid patching ipaddr.py twice. The currently duplicated section in get_ip_addr() does not cause any problems, but it's a good idea to clean it up: # Exclude interfaces that have duplicate MACs # such as OVS gretap and erspan interfaces ifaces = { k: v for k, v in ifaces.items() if v.get('mac', '') != '00:00:00:00:00:00'} # Exclude interfaces that have duplicate MACs # such as OVS gretap and erspan interfaces ifaces = { k: v for k, v in ifaces.items() if v.get('mac', '') != '00:00:00:00:00:00'} Change-Id: Ia2be1e204246a320a45a00ec66f7e65c2880ba5c --- images/maas-region-controller/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/images/maas-region-controller/Dockerfile b/images/maas-region-controller/Dockerfile index 2552422..9e92a26 100644 --- a/images/maas-region-controller/Dockerfile +++ b/images/maas-region-controller/Dockerfile @@ -78,7 +78,6 @@ RUN cd /usr/lib/python3/dist-packages/maasserver/models && patch partition.py < RUN cd /usr/lib/python3/dist-packages/maasserver && patch preseed_storage.py < /tmp/2.3_bios_grub_preseed.patch RUN cd /usr/lib/python3/dist-packages/metadataserver/user_data/templates/snippets && patch maas_enlist.sh < /tmp/2.3_maas_enlist.patch RUN cd /usr/lib/python3/dist-packages/provisioningserver/utils && patch ipaddr.py < /tmp/2.3_mac_address.patch -RUN cd /usr/lib/python3/dist-packages/provisioningserver/utils && patch ipaddr.py < /tmp/2.3_mac_address.patch RUN cd /usr/lib/python3/dist-packages/provisioningserver/templates/proxy && patch maas-proxy.conf.template < /tmp/2.3_proxy_acl.patch COPY journalctl-to-tty.service /etc/systemd/system/journalctl-to-tty.service