diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-06-13 21:46:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-13 21:46:15 -0400 |
| commit | 85a3806b57858b35b793b8391b67f88bfeec9e10 (patch) | |
| tree | 01322684429cf6d9807582b0fb0d13dafb3107b4 /images/installer/system-container/root | |
| parent | 4dcd01577bc6f92ef6f1f294c4374a14e0895b96 (diff) | |
| parent | 1720a5209dab342b84afd625cf609fe8fddf1f83 (diff) | |
| download | openshift-85a3806b57858b35b793b8391b67f88bfeec9e10.tar.gz openshift-85a3806b57858b35b793b8391b67f88bfeec9e10.tar.bz2 openshift-85a3806b57858b35b793b8391b67f88bfeec9e10.tar.xz openshift-85a3806b57858b35b793b8391b67f88bfeec9e10.zip | |
Merge branch 'master' into Upgrade_Calico_Version_to_2.2.1
Diffstat (limited to 'images/installer/system-container/root')
| -rw-r--r-- | images/installer/system-container/root/exports/config.json.template | 16 | ||||
| -rw-r--r-- | images/installer/system-container/root/exports/manifest.json | 2 |
2 files changed, 14 insertions, 4 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..397ac941a 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", @@ -171,6 +171,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..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" } } |