b648edfe40
Image changes: * base image ubuntu:18.04 * MAAS version 2.8.6-8602-g.07cdffcaa-0ubuntu1~18.04.1 from ppa/2.8 * default contents of /var/lib/maas are archived in /opt/maas * updated patches: - 2.3_bios_grub_partition.patch, changed in maas [0] - 2.3_partitiontable_does_not_exist.patch, changed in maas [1] [2] - 2.3_secure_headers.patch, updated for twisted 17.9.0 [3] * removed patches: - 2.3_bios_grub_preseed.patch, changed in maas, now N/A [0] - 2.3_hostheader.patch, fixed in maas [4] - 2.3_maas_enlist.patch, fixed in maas [5] - 2.3_mac_address.patch, fixed in maas [6] * new patches: - 2.8_maas_ipmi_autodetect_tool.patch, enlistment reliability * reformatted patches due to blackening change [1]: - 2.3_configure_ipmi_user.patch - 2.3_ipmi_error.patch - 2.3_kernel_package.patch, custom req to specify kernel package - 2.3_nic_filter.patch, custom req to ignore cali* interfaces - 2.3_region_secret_rotate.patch - 2.3_route.patch Chart changes: * maas-region podport is 5240 * maas config option http_boot is no longer configurable [7] * start script restores some default files into /var/lib/maas * register-rack-controller script removes old files in /etc/maas * enlist userdata now matches commissioning/curtin userdata [8] * force_gpt option is removed [9], as GPT is now the default * update to configure remote_syslog in import resources job [10] * enlist_commissioning is disabled for backwards compatibility [11] 0:d8e234eb091:db30bb39fa2:665feb75753: https://github.com/twisted/twisted/blob/twisted-17.9.0/src/twisted/web/server.py 4:573da697295:d390a1da6a6:34631c2fe57:0e94c26a538:22641cffcc9:97c25a048610:d67c359c7b11:51b9712c20Change-Id: I0685d76cf083ff5aa33c8db552059721289d5c53
75 lines
2.8 KiB
Docker
75 lines
2.8 KiB
Docker
ARG FROM=ubuntu:18.04
|
|
FROM ${FROM}
|
|
|
|
LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode'
|
|
LABEL org.opencontainers.image.url='https://airshipit.org'
|
|
LABEL org.opencontainers.image.documentation='https://github.com/openstack/airship-maas'
|
|
LABEL org.opencontainers.image.source='https://git.openstack.org/openstack/airship-maas'
|
|
LABEL org.opencontainers.image.vendor='The Airship Authors'
|
|
LABEL org.opencontainers.image.licenses='Apache-2.0'
|
|
|
|
ARG HTTP_PROXY
|
|
ARG HTTPS_PROXY
|
|
ARG NO_PROXY
|
|
ARG http_proxy
|
|
ARG https_proxy
|
|
ARG no_proxy
|
|
|
|
ENV DEBIAN_FRONTEND noninteractive
|
|
ENV container docker
|
|
|
|
ENV MAAS_VERSION 2.8.6-8602-g.07cdffcaa-0ubuntu1~18.04.1
|
|
|
|
RUN apt-get -qq update \
|
|
&& apt-get install -y \
|
|
avahi-daemon \
|
|
isc-dhcp-server \
|
|
jq \
|
|
libvirt-bin \
|
|
patch \
|
|
software-properties-common \
|
|
sudo \
|
|
systemd \
|
|
# Don't start any optional services except for the few we need.
|
|
# (specifically, don't start avahi-daemon, isc-dhcp-server, or libvirtd)
|
|
&& find /etc/systemd/system \
|
|
/lib/systemd/system \
|
|
-path '*.wants/*' \
|
|
-not -name '*journald*' \
|
|
-not -name '*systemd-tmpfiles*' \
|
|
-not -name '*systemd-user-sessions*' \
|
|
-exec rm \{} \; \
|
|
&& systemctl set-default multi-user.target \
|
|
# Install maas from the ppa
|
|
&& add-apt-repository -yu ppa:maas/2.8 \
|
|
&& apt-get install -y \
|
|
maas-rack-controller=$MAAS_VERSION \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
# Preserve the directory structure, permissions, and contents of /var/lib/maas
|
|
RUN mkdir -p /opt/maas/ && tar -cvzf /opt/maas/var-lib-maas.tgz /var/lib/maas
|
|
|
|
# register ourselves with the region controller
|
|
COPY scripts/register-rack-controller.service /lib/systemd/system/register-rack-controller.service
|
|
RUN systemctl enable register-rack-controller.service
|
|
|
|
# Patch so that Calico interfaces are ignored
|
|
COPY 2.3_nic_filter.patch /tmp/2.3_nic_filter.patch
|
|
COPY 2.3_secure_headers.patch /tmp/2.3_secure_headers.patch
|
|
# Patch so maas knows that "BMC error" is retriable
|
|
COPY 2.3_ipmi_error.patch /tmp/2.3_ipmi_error.patch
|
|
|
|
RUN cd /usr/lib/python3/dist-packages/provisioningserver/utils && patch network.py < /tmp/2.3_nic_filter.patch
|
|
RUN cd /usr/lib/python3/dist-packages/twisted/web && patch server.py < /tmp/2.3_secure_headers.patch
|
|
RUN cd /usr/lib/python3/dist-packages/provisioningserver/drivers/power && patch ipmi.py < /tmp/2.3_ipmi_error.patch
|
|
|
|
# echo journalctl logs to the container's stdout
|
|
COPY scripts/journalctl-to-tty.service /etc/systemd/system/journalctl-to-tty.service
|
|
RUN systemctl enable journalctl-to-tty.service
|
|
|
|
# quiet sudo for the maas user
|
|
RUN umask 0337; echo 'Defaults:maas !pam_session, !syslog' > /etc/sudoers.d/99-maas-no-log
|
|
|
|
# initalize systemd
|
|
CMD ["/bin/bash", "-c", "exec /sbin/init --log-target=console 3>&1"]
|