summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Hussey <sh8121@att.com>2018-06-25 12:56:14 -0500
committerScott Hussey <sh8121@att.com>2018-06-25 12:56:56 -0500
commit7af3ee934732bf1aec6b452f34727ef563a7f179 (patch)
tree2757ab08bcface6c6adc259f1323079b07f03d8f
parent18a82a0a70fa807e5c6147951720a6375dca31a8 (diff)
(fix) Disable libvirt service
- Rearrange Dockerfile layers to run the systemd link deletion statement to after the install of the libvirtd package Change-Id: I49b0cb4ef4ebf6e92d2f99a7137387a5018ed3b5
Notes
Notes (review): Code-Review+2: Pete Birley <pete@port.direct> Code-Review+2: Felipe Monteiro <felipe.monteiro@att.com> Workflow+1: Felipe Monteiro <felipe.monteiro@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 29 Jun 2018 22:52:25 +0000 Reviewed-on: https://review.openstack.org/577888 Project: openstack/airship-maas Branch: refs/heads/master
-rw-r--r--images/maas-rack-controller/Dockerfile24
1 files changed, 11 insertions, 13 deletions
diff --git a/images/maas-rack-controller/Dockerfile b/images/maas-rack-controller/Dockerfile
index 12c8695..81fd850 100644
--- a/images/maas-rack-controller/Dockerfile
+++ b/images/maas-rack-controller/Dockerfile
@@ -3,7 +3,17 @@ FROM ubuntu:16.04
3ENV DEBIAN_FRONTEND noninteractive 3ENV DEBIAN_FRONTEND noninteractive
4ENV container docker 4ENV container docker
5 5
6
7# everything else below is to setup maas into the systemd initialized
8# container based on ubuntu 16.04
9RUN apt-get -qq update && \
10 apt-get -y install \
11 sudo \
12 software-properties-common \
13 libvirt-bin \
14 systemd
6# Don't start any optional services except for the few we need. 15# Don't start any optional services except for the few we need.
16
7RUN find /etc/systemd/system \ 17RUN find /etc/systemd/system \
8 /lib/systemd/system \ 18 /lib/systemd/system \
9 -path '*.wants/*' \ 19 -path '*.wants/*' \
@@ -13,19 +23,6 @@ RUN find /etc/systemd/system \
13 -exec rm \{} \; 23 -exec rm \{} \;
14RUN systemctl set-default multi-user.target 24RUN systemctl set-default multi-user.target
15 25
16# everything else below is to setup maas into the systemd initialized
17# container based on ubuntu 16.04
18RUN apt-get -qq update && \
19 apt-get -y install \
20 sudo \
21 software-properties-common \
22 libvirt-bin
23
24# TODO(alanmeadows)
25# we need systemd 231 per https://github.com/systemd/systemd/commit/a1350640ba605cf5876b25abfee886488a33e50b
26#RUN add-apt-repository ppa:pitti/systemd -y && add-apt-repository ppa:maas/stable -y && apt-get update
27RUN apt-get install -y systemd
28
29# install syslog and enable it 26# install syslog and enable it
30RUN apt-get install -y rsyslog 27RUN apt-get install -y rsyslog
31RUN systemctl enable rsyslog.service 28RUN systemctl enable rsyslog.service
@@ -45,6 +42,7 @@ RUN systemctl enable register-rack-controller.service
45RUN mv /usr/sbin/tcpdump /usr/bin/tcpdump 42RUN mv /usr/sbin/tcpdump /usr/bin/tcpdump
46RUN ln -s /usr/bin/tcpdump /usr/sbin/tcpdump 43RUN ln -s /usr/bin/tcpdump /usr/sbin/tcpdump
47 44
45# echo journalctl logs to the container's stdout
48COPY scripts/journalctl-to-tty.service /etc/systemd/system/journalctl-to-tty.service 46COPY scripts/journalctl-to-tty.service /etc/systemd/system/journalctl-to-tty.service
49RUN mkdir -p /etc/systemd/system/basic.target.wants ;\ 47RUN mkdir -p /etc/systemd/system/basic.target.wants ;\
50 ln -s /etc/systemd/system/journalctl-to-tty.service /etc/systemd/system/basic.target.wants/journalctl-to-tty.service 48 ln -s /etc/systemd/system/journalctl-to-tty.service /etc/systemd/system/basic.target.wants/journalctl-to-tty.service