done for all slices at this point, next step will handle omf-friendly
slices only
"""Functionality common to all account classes.
"""Functionality common to all account classes.
import os, os.path
import time
from threading import BoundedSemaphore
import os, os.path
import time
from threading import BoundedSemaphore
# the util-vserver-pl module
import vserver
# the util-vserver-pl module
import vserver
# needs to be done before sliver starts
def expose_ssh_dir (self):
try:
# needs to be done before sliver starts
def expose_ssh_dir (self):
try:
- root_ssh="/home/%s/.ssh"
+ root_ssh="/home/%s/.ssh"%self.name
sliver_ssh="/vservers/%s/home/%s/.ssh"%(self.name,self.name)
# any of both might not exist yet
for path in [root_ssh,sliver_ssh]:
sliver_ssh="/vservers/%s/home/%s/.ssh"%(self.name,self.name)
# any of both might not exist yet
for path in [root_ssh,sliver_ssh]:
if mounts.find(sliver_ssh)<0:
# xxx perform mount
subprocess.call("mount --bind -o ro %s %s"%(root_ssh,sliver_ssh),shell=True)
if mounts.find(sliver_ssh)<0:
# xxx perform mount
subprocess.call("mount --bind -o ro %s %s"%(root_ssh,sliver_ssh),shell=True)
+ logger.log("expose_ssh_dir: %s mounted into slice %s"%(root_ssh,self.name))
- logger.log("expose_ssh_dir with slice %s failed"%self.name)
+ logger.log_exc("expose_ssh_dir with slice %s failed"%self.name)
def start(self, delay=0):
if self.rspec['enabled'] <= 0:
def start(self, delay=0):
if self.rspec['enabled'] <= 0: