Merge "Add support for symlinks instead of bindmounts for version control"
This commit is contained in:
commit
1d6add41a2
|
@ -287,6 +287,9 @@ def mount_new_deployment(deployment_dir):
|
||||||
LOG.warning(info_msg)
|
LOG.warning(info_msg)
|
||||||
raise OSTreeCommandFail(msg)
|
raise OSTreeCommandFail(msg)
|
||||||
finally:
|
finally:
|
||||||
|
# Handle the switch from bind mounts to symlinks for K8s versions.
|
||||||
|
# Can be removed once the switch is complete.
|
||||||
|
if os.path.isdir('/usr/local/kubernetes/current'):
|
||||||
try:
|
try:
|
||||||
sh.mount("/usr/local/kubernetes/current/stage1")
|
sh.mount("/usr/local/kubernetes/current/stage1")
|
||||||
sh.mount("/usr/local/kubernetes/current/stage2")
|
sh.mount("/usr/local/kubernetes/current/stage2")
|
||||||
|
|
|
@ -313,6 +313,9 @@ def mount_new_deployment(deployment_dir):
|
||||||
LOG.warning(info_msg)
|
LOG.warning(info_msg)
|
||||||
raise OSTreeCommandFail(msg)
|
raise OSTreeCommandFail(msg)
|
||||||
finally:
|
finally:
|
||||||
|
# Handle the switch from bind mounts to symlinks for K8s versions.
|
||||||
|
# Can be removed once the switch is complete.
|
||||||
|
if os.path.isdir('/usr/local/kubernetes/current'):
|
||||||
try:
|
try:
|
||||||
sh.mount("/usr/local/kubernetes/current/stage1")
|
sh.mount("/usr/local/kubernetes/current/stage1")
|
||||||
sh.mount("/usr/local/kubernetes/current/stage2")
|
sh.mount("/usr/local/kubernetes/current/stage2")
|
||||||
|
|
Loading…
Reference in New Issue