From d4a8eb3b492a7af2dc48996792ecf95556b615cc Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Tue, 13 Jun 2017 17:23:32 +0200
Subject: installer: add bind mount for /etc/resolv.conf

Use the DNS configuration from the host.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1460978

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 .../system-container/root/exports/config.json.template         | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'images')

diff --git a/images/installer/system-container/root/exports/config.json.template b/images/installer/system-container/root/exports/config.json.template
index 383e3696e..718ce1d53 100644
--- a/images/installer/system-container/root/exports/config.json.template
+++ b/images/installer/system-container/root/exports/config.json.template
@@ -170,6 +170,16 @@
                 "mode=755"
             ]
         },
+        {
+            "destination": "/etc/resolv.conf",
+            "type": "bind",
+            "source": "/etc/resolv.conf",
+            "options": [
+                "ro",
+                "rbind",
+                "rprivate"
+            ]
+        },
         {
             "destination": "/sys/fs/cgroup",
             "type": "cgroup",
-- 
cgit v1.2.3


From 8fb905e7b84da6139da0b74067f987df5317464b Mon Sep 17 00:00:00 2001
From: Steve Milner <smilner@redhat.com>
Date: Tue, 13 Jun 2017 12:18:47 -0400
Subject: Update mounts in system container installer

This change will allow retry files to be stored in $HOME_ROOT.

- SSH_ROOT replaced with HOME_ROOT
- /root[container] -> $HOME_ROOT[host]
---
 images/installer/system-container/root/exports/config.json.template | 6 +++---
 images/installer/system-container/root/exports/manifest.json        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'images')

diff --git a/images/installer/system-container/root/exports/config.json.template b/images/installer/system-container/root/exports/config.json.template
index 383e3696e..441087d84 100644
--- a/images/installer/system-container/root/exports/config.json.template
+++ b/images/installer/system-container/root/exports/config.json.template
@@ -102,7 +102,7 @@
         },
         {
             "type": "bind",
-            "source": "$SSH_ROOT",
+            "source": "$HOME_ROOT/.ssh",
             "destination": "/opt/app-root/src/.ssh",
             "options": [
                 "bind",
@@ -112,8 +112,8 @@
         },
         {
             "type": "bind",
-            "source": "$SSH_ROOT",
-            "destination": "/root/.ssh",
+            "source": "$HOME_ROOT",
+            "destination": "/root",
             "options": [
                 "bind",
                 "rw",
diff --git a/images/installer/system-container/root/exports/manifest.json b/images/installer/system-container/root/exports/manifest.json
index 1db845965..f735494d4 100644
--- a/images/installer/system-container/root/exports/manifest.json
+++ b/images/installer/system-container/root/exports/manifest.json
@@ -5,7 +5,7 @@
         "VAR_LIB_OPENSHIFT_INSTALLER" : "/var/lib/openshift-installer",
         "VAR_LOG_OPENSHIFT_LOG": "/var/log/ansible.log",
         "PLAYBOOK_FILE": "/usr/share/ansible/openshift-ansible/playbooks/byo/config.yml",
-        "SSH_ROOT": "/root/.ssh",
+	"HOME_ROOT": "/root",
         "INVENTORY_FILE": "/dev/null"
     }
 }
-- 
cgit v1.2.3