2 files changed, 17 insertions, 5 deletions
diff --git a/images/installer/system-container/root/exports/config.json.template b/images/installer/system-container/root/exports/config.json.template
index 383e3696e..739c0080f 100644
--- a/images/installer/system-container/root/exports/config.json.template
+++ b/images/installer/system-container/root/exports/config.json.template
@@ -21,7 +21,8 @@
             "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
             "TERM=xterm",
             "OPTS=$OPTS",
-            "PLAYBOOK_FILE=$PLAYBOOK_FILE"
+            "PLAYBOOK_FILE=$PLAYBOOK_FILE",
+            "ANSIBLE_CONFIG=$ANSIBLE_CONFIG"
         ],
         "cwd": "/opt/app-root/src/",
         "rlimits": [
@@ -102,7 +103,7 @@
         },
         {
             "type": "bind",
-            "source": "$SSH_ROOT",
+            "source": "$HOME_ROOT/.ssh",
             "destination": "/opt/app-root/src/.ssh",
             "options": [
                 "bind",
@@ -112,8 +113,8 @@
         },
         {
             "type": "bind",
-            "source": "$SSH_ROOT",
-            "destination": "/root/.ssh",
+            "source": "$HOME_ROOT",
+            "destination": "/root",
             "options": [
                 "bind",
                 "rw",
@@ -171,6 +172,16 @@
             ]
         },
         {
+            "destination": "/etc/resolv.conf",
+            "type": "bind",
+            "source": "/etc/resolv.conf",
+            "options": [
+                "ro",
+                "rbind",
+                "rprivate"
+            ]
+        },
+        {
             "destination": "/sys/fs/cgroup",
             "type": "cgroup",
             "source": "cgroup",
diff --git a/images/installer/system-container/root/exports/manifest.json b/images/installer/system-container/root/exports/manifest.json
index 1db845965..321a84ee8 100644
--- a/images/installer/system-container/root/exports/manifest.json
+++ b/images/installer/system-container/root/exports/manifest.json
@@ -5,7 +5,8 @@
         "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",
+	"ANSIBLE_CONFIG": "/usr/share/ansible/openshift-ansible/ansible.cfg",
         "INVENTORY_FILE": "/dev/null"
     }
 }