From e9f3b2c568d11b5b38afa4be79840429fdcdf10c Mon Sep 17 00:00:00 2001 From: Nicolas Wavrant <nicolas.wavrant@nexedi.com> Date: Fri, 16 Sep 2016 10:42:36 +0200 Subject: [PATCH] resilient & slaprunner: get username from userinfo recipe instead of slapconfiguration --- software/slaprunner/common.cfg | 2 +- software/slaprunner/instance-runner.cfg | 5 ++++- stack/resilient/buildout.cfg | 2 +- stack/resilient/pbsready.cfg.in | 6 +++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/software/slaprunner/common.cfg b/software/slaprunner/common.cfg index b5a9f5a616..9fc5387c37 100644 --- a/software/slaprunner/common.cfg +++ b/software/slaprunner/common.cfg @@ -54,7 +54,7 @@ mode = 0644 recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance-runner.cfg output = ${buildout:directory}/template-runner.cfg.in -md5sum = 8833cc43e6ce808b646bd92f67e57d53 +md5sum = 26a58e69c4c59d30c9e2f50075cdc679 mode = 0644 [template-runner-import-script] diff --git a/software/slaprunner/instance-runner.cfg b/software/slaprunner/instance-runner.cfg index fab798c53b..ec54be6c6c 100644 --- a/software/slaprunner/instance-runner.cfg +++ b/software/slaprunner/instance-runner.cfg @@ -530,12 +530,15 @@ password = $${htpasswd:passwd} #-- #-- Send information to SlapOS Master +[user-info] +recipe = slapos.cookbook:userinfo + [publish-connection-information] recipe = slapos.cookbook:publish backend-url = $${slaprunner:access-url} init-user = $${runner-htpasswd:user} init-password = $${runner-htpasswd:password} -ssh-command = ssh $${slap-configuration:slapuser}@$${slap-network-information:global-ipv6} -p $${runner-sshd-port:port} +ssh-command = ssh $${user-info:pw-name}@$${slap-network-information:global-ipv6} -p $${runner-sshd-port:port} git-public-url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global_port}/git-public/ git-private-url = https://[$${httpd-parameters:global_ip}]:$${httpd-parameters:global_port}/git/ monitor-base-url = $${publish:monitor-base-url} diff --git a/stack/resilient/buildout.cfg b/stack/resilient/buildout.cfg index 266acfc958..4d578c8d65 100644 --- a/stack/resilient/buildout.cfg +++ b/stack/resilient/buildout.cfg @@ -41,7 +41,7 @@ eggs = recipe = slapos.recipe.template url = ${:_profile_base_location_}/pbsready.cfg.in output = ${buildout:directory}/pbsready.cfg -md5sum = 9deb4e6ee2779d228a01599cdd424724 +md5sum = fee06ab268015b394ec49cb4600de1ed mode = 0644 [pbsready-import] diff --git a/stack/resilient/pbsready.cfg.in b/stack/resilient/pbsready.cfg.in index 8accbf5bc8..2fd05277ae 100644 --- a/stack/resilient/pbsready.cfg.in +++ b/stack/resilient/pbsready.cfg.in @@ -263,9 +263,13 @@ mode = 700 #---------------- #-- #-- Connection informations to re-use. + +[user-info] +recipe = slapos.cookbook:userinfo + # XXX-Cedric: when "aggregation" system is done in libslap, directly publish. [resilient-publish-connection-parameter] recipe = slapos.cookbook:publish ssh-public-key = $${sshkeys-sshd:public-key-value} -ssh-url = ssh://$${slap-configuration:slapuser}@[$${sshd-raw-server:host}]:$${sshd-port:port}/$${rdiff-backup-server:path} +ssh-url = ssh://$${user-info:pw-name}@[$${sshd-raw-server:host}]:$${sshd-port:port}/$${rdiff-backup-server:path} ip = $${slap-network-information:global-ipv6} -- 2.30.9