From 3ff4ffaff68598a7cca24a1131a7ffffcc2f6772 Mon Sep 17 00:00:00 2001 From: Mathieu Mitchell Date: Thu, 7 Jan 2016 08:17:08 -0500 Subject: [PATCH] Provide /etc/resolv.conf to chroot In order to allow hostname resolution, /etc/resolv.conf needs to be provided. Change-Id: I0a317de023118f27f2c18b272adf0cbd4ac2e480 Closes-Bug: #1525898 --- imagebuild/coreos/oem/cloud-config.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/imagebuild/coreos/oem/cloud-config.yml b/imagebuild/coreos/oem/cloud-config.yml index 7e5164c1f..4c9575239 100644 --- a/imagebuild/coreos/oem/cloud-config.yml +++ b/imagebuild/coreos/oem/cloud-config.yml @@ -139,6 +139,19 @@ coreos: Type=none Options=bind + - name: opt-ironic\x2dpython\x2dagent-etc-resolvconf.service + command: start + content: | + [Unit] + Description="Provide host resolv.conf to chroot" + After=ironic-python-agent-container-creation.service + Requires=ironic-python-agent-container-creation.service + + [Service] + Type=oneshot + RemainAfterExit=yes + ExecStart=/bin/ln -f /etc/resolv.conf /opt/ironic-python-agent/etc/resolv.conf + - name: ironic-python-agent.service command: start content: | @@ -151,6 +164,7 @@ coreos: After=opt-ironic\x2dpython\x2dagent-sys.mount After=opt-ironic\x2dpython\x2dagent-run.mount After=opt-ironic\x2dpython\x2dagent-mnt.mount + After=opt-ironic\x2dpython\x2dagent-etc-resolvconf.service Requires=ironic-python-agent-container-creation.service Requires=opt-ironic\x2dpython\x2dagent-proc.mount @@ -159,6 +173,7 @@ coreos: Requires=opt-ironic\x2dpython\x2dagent-sys.mount Requires=opt-ironic\x2dpython\x2dagent-run.mount Requires=opt-ironic\x2dpython\x2dagent-mnt.mount + Requires=opt-ironic\x2dpython\x2dagent-etc-resolvconf.service [Service] ExecStart=/usr/bin/chroot /opt/ironic-python-agent \