Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/237380
Change subject: 0.1.1-wmf3: Use 'debian' user for setup step ...................................................................... 0.1.1-wmf3: Use 'debian' user for setup step Bug: T111377 Change-Id: If5298b3a95ab7b090ed252684a12b9293243b667 --- M debian/changelog A debian/patches/0005-Add-debian-user-in-bootstrapServer.patch M debian/patches/series 3 files changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/nodepool refs/changes/80/237380/1 diff --git a/debian/changelog b/debian/changelog index d64805f..38d5d18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +nodepool (0.1.1-wmf3) jessie-wikimedia; urgency=medium + + * Use 'debian' user when setting up Debian based instances. + * Patch: + + 0005-Add-debian-user-in-bootstrapServer + [9b16e0e] Add 'debian' user in bootstrapServer() + Antoine Musso <has...@free.fr> + + -- Antoine Musso <has...@free.fr> Thu, 10 Sep 2015 16:16:27 +0200 + nodepool (0.1.1-wmf2) jessie-wikimedia; urgency=medium * Support python-statsd >= 3.x diff --git a/debian/patches/0005-Add-debian-user-in-bootstrapServer.patch b/debian/patches/0005-Add-debian-user-in-bootstrapServer.patch new file mode 100644 index 0000000..7540b9e --- /dev/null +++ b/debian/patches/0005-Add-debian-user-in-bootstrapServer.patch @@ -0,0 +1,26 @@ +From: Antoine Musso <has...@free.fr> +Date: Wed, 9 Sep 2015 18:34:26 +0200 +Subject: Add 'debian' user in bootstrapServer() + +The method attempt to login as 'root' then iterate a few well known +usernames. Debian recommands using 'debian'. + +Change-Id: If3f0f0137850e60780515c69329465837c4c91d8 +--- + nodepool/nodepool.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/nodepool/nodepool.py b/nodepool/nodepool.py +index d0a20ff..397284d 100644 +--- a/nodepool/nodepool.py ++++ b/nodepool/nodepool.py +@@ -1085,7 +1085,8 @@ def bootstrapServer(self, server, key, use_password=False): + # We have connected to the node but couldn't do anything as root + # try distro specific users, since we know ssh is up (a timeout + # didn't occur), we can connect with a very sort timeout. +- for username in ['ubuntu', 'fedora', 'cloud-user', 'centos']: ++ for username in ['ubuntu', 'fedora', 'cloud-user', 'centos', ++ 'debian']: + try: + host = utils.ssh_connect(server['public_v4'], username, + ssh_kwargs, diff --git a/debian/patches/series b/debian/patches/series index d16f52d..013afd6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0002-Debug-dying-task-managers.patch 0003-Convert-to-use-latest-statsd-version.patch 0004-Convert-timing-metrics-to-milliseconds.patch +0005-Add-debian-user-in-bootstrapServer.patch -- To view, visit https://gerrit.wikimedia.org/r/237380 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If5298b3a95ab7b090ed252684a12b9293243b667 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/nodepool Gerrit-Branch: debian Gerrit-Owner: Hashar <has...@free.fr> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
