Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:nimbusproject/cloudinit.d

  • Loading branch information...
commit d56e838acc9a508aafec4808ae8047478a50933c 2 parents dc41091 + be6e890
@buzztroll buzztroll authored
Showing with 7 additions and 0 deletions.
  1. +3 −0  cloudinitd/services.py
  2. +4 −0 cloudinitd/user_api.py
View
3  cloudinitd/services.py
@@ -347,6 +347,9 @@ def get_scp_command(self, src, dst, upload=False, recursive=False, forcehost=Non
cmd += "%s%s:%s %s" % (user, hostname, src, dst)
return cmd
+ def get_scp_username(self):
+ return self._s.scp_username
+
def _get_ssh_command(self, host):
if not host:
raise ConfigException("Trying to create and ssh command to a null hostname, something is not right.")
View
4 cloudinitd/user_api.py
@@ -448,6 +448,10 @@ def get_scp_command(self, src, dst, upload=False, recursive=False, forcehost=Non
raise APIUsageException("This Cloud service has no real backing service")
return self._svc.get_scp_command(src, dst, upload=upload, recursive=recursive, forcehost=forcehost)
+ def get_scp_username(self):
+ if self._svc is None:
+ raise APIUsageException("This Cloud service has no real backing service")
+ return self._svc.get_scp_username()
class CloudServiceException(ServiceException):
Please sign in to comment.
Something went wrong with that request. Please try again.