From 36728cf6481b43d068c1c94a42d65a4b1ed43fea Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Sun, 25 Jan 2015 11:37:26 +0100 Subject: [PATCH] Since bootstrap-vz uses `sudo' to elevate privileges, the root password will never be needed --- bootstrapvz/remote/build-servers-schema.yml | 1 - bootstrapvz/remote/build_servers.py | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bootstrapvz/remote/build-servers-schema.yml b/bootstrapvz/remote/build-servers-schema.yml index ceba3eb..20f0b85 100644 --- a/bootstrapvz/remote/build-servers-schema.yml +++ b/bootstrapvz/remote/build-servers-schema.yml @@ -50,7 +50,6 @@ definitions: port: {type: integer} username: {type: string} password: {type: string} - root_password: {type: string} keyfile: {$ref: '#/definitions/absolute_path'} server_bin: {$ref: '#/definitions/absolute_path'} required: [type, can_bootstrap, release] diff --git a/bootstrapvz/remote/build_servers.py b/bootstrapvz/remote/build_servers.py index 46b3758..bd8e8ab 100644 --- a/bootstrapvz/remote/build_servers.py +++ b/bootstrapvz/remote/build_servers.py @@ -66,8 +66,7 @@ class RemoteBuildServer(BuildServer): self.address = settings['address'] self.port = settings['port'] self.username = settings['username'] - self.password = settings['password'] - self.root_password = settings['root_password'] + self.password = settings.get('password', None) self.keyfile = settings['keyfile'] self.server_bin = settings['server_bin']