Commit 586b083a authored by Ilias Tsitsimpis's avatar Ilias Tsitsimpis Committed by Christos Stavrakakis
Browse files

ci: Add --ssh-keys command line option

Using this option one can specify a file containing
ssh authentication keys to be uploaded and installed
on the newly created server.
parent 866fce06
......@@ -19,9 +19,9 @@ patch_pydist = True
# Configuration of git (on remote server)
git_config_name = Buildbot
git_config_mail =
# Network address from which we allow access to server. If not set, access
# to server is not restricted.
filter_access_network =
# Network address from which we allow access to server.
# If not set, access to server is not restricted.
accept_ssh_from =
# Config file to save temporary options (eg IPs, passwords etc)
temporary_config = /tmp/ci_temp_conf
......@@ -36,6 +36,9 @@ server_name = Synnefo Deployment
flavor_id = 639
# Image to use (name must contain this)
image_name = OldStable
# File containing the ssh keys to upload/install to server
# If not set, no ssh keys will be installed
ssh_keys =
......@@ -60,6 +60,9 @@ def main(): # Too many branches. pylint: disable-msg=R0912
help="Name of flavor to use for the server.")
parser.add_option("-i", "--image", dest="image", default=None,
help="UUID of image to use for the server.")
parser.add_option("--ssh-keys", dest="ssh_keys", default=None,
help="Upload/Install the public ssh keys contained"
" in this file to the server")
parser.add_option("--fetch-packages", dest="fetch_packages",
help="Download the debian packages that were created"
......@@ -102,7 +105,8 @@ def main(): # Too many branches. pylint: disable-msg=R0912
if getattr(options, CREATE_SERVER_CMD, False):
if getattr(options, BUILD_SYNNEFO_CMD, False):
......@@ -36,6 +36,12 @@ def _run(cmd, verbose):
def _put(local, remote):
"""Run fabric put command without output"""
with fabric.quiet():
fabric.put(local, remote)
def _red(msg):
"""Red color"""
#return "\x1b[31m" + str(msg) + "\x1b[0m"
......@@ -226,7 +232,7 @@ class SynnefoCI(object):
self._wait_transition(server_id, "ACTIVE", "DELETED")
def create_server(self, image_id=None, flavor_id=None):
def create_server(self, image_id=None, flavor_id=None, ssh_keys=None):
"""Create slave server""""Create a new server..")
if image_id is None:
......@@ -251,11 +257,11 @@ class SynnefoCI(object):
server = self._wait_transition(server_id, "BUILD", "ACTIVE")
self.setup_fabric()"Setup firewall")
accept_ssh_from = self.config.get('Global', 'filter_access_network')
accept_ssh_from = self.config.get('Global', 'accept_ssh_from')
if accept_ssh_from != "":
self.logger.debug("Block ssh except from %s" % accept_ssh_from)
cmd = """
......@@ -300,18 +306,20 @@ class SynnefoCI(object):
self.logger.debug("Server's IPv4 is %s" % _green(server_ip))
self.write_config('server_port', server_port)
self.logger.debug("Server's ssh port is %s" % _green(server_port))
self.logger.debug("Access server using \"ssh -p %s %s@%s\"" %
(server_port, fabric.env.user, server_ip))
def _copy_ssh_keys(self):
def _copy_ssh_keys(self, ssh_keys):
"""Upload/Install ssh keys to server"""
if not self.config.has_option("Deployment", "ssh_keys"):
authorized_keys = self.config.get("Deployment",
if authorized_keys != "" and os.path.exists(authorized_keys):
self.logger.debug("Check for authentication keys to upload")
if ssh_keys is None:
ssh_keys = self.config.get("Deployment", "ssh_keys")
if ssh_keys != "" and os.path.exists(ssh_keys):
keyfile = '/tmp/' % fabric.env.user
_run('mkdir -p ~/.ssh && chmod 700 ~/.ssh', False)
fabric.put(authorized_keys, keyfile)
_put(ssh_keys, keyfile)
_run('cat %s >> ~/.ssh/authorized_keys' % keyfile, False)
_run('rm %s' % keyfile, False)
self.logger.debug("Uploaded ssh authorized keys")
......@@ -506,8 +514,7 @@ class SynnefoCI(object):
raise ValueError("Unknown schema: %s" % schema)
self.logger.debug("Upload schema files to server")
with fabric.quiet():
fabric.put(os.path.join(schema_dir, "*"), "/etc/snf-deploy/")
_put(os.path.join(schema_dir, "*"), "/etc/snf-deploy/")
self.logger.debug("Change password in nodes.conf file")
cmd = """
......@@ -536,8 +543,7 @@ class SynnefoCI(object):
self.logger.debug("Upload file")
unit_tests_file = os.path.join(self.ci_dir, "")
with fabric.quiet():
fabric.put(unit_tests_file, ".")
_put(unit_tests_file, ".")
self.logger.debug("Run unit tests")
cmd = """
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment