zuul
/
nodepool
Code Issues Proposed changes

Merge "Use diskimage username in AWS and Azure drivers"

This commit is contained in:
Zuul 2023-08-23 00:57:54 +00:00 committed by Gerrit Code Review
parent 7c9e1bc0d8 202230e16b
commit d6c2422bc3
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/source/aws.rst
View File

@ -343,6 +343,9 @@ Selecting the ``aws`` driver adds the following options to the
The username that should be used when connecting to the node.
.. warning:: This option is deprecated. Specify the username
on the diskimage definition itself instead.
.. attr:: connection-type
:type: string

3
doc/source/azure.rst
View File

@ -510,6 +510,9 @@ section of the configuration.
The username that should be used when connecting to the node.
.. warning:: This option is deprecated. Specify the username
on the diskimage definition itself instead.
.. attr:: key
:type: str

2
nodepool/driver/aws/config.py
View File

@ -94,7 +94,7 @@ class AwsProviderDiskImage(ConfigValue):
self.pause = bool(image.get('pause', False))
self.python_path = image.get('python-path', 'auto')
self.shell_type = image.get('shell-type')
self.username = image.get('username')
self.username = image.get('username', diskimage.username)
self.connection_type = image.get('connection-type', 'ssh')
self.connection_port = image.get(
'connection-port',

2
nodepool/driver/azure/config.py
View File

@ -121,7 +121,7 @@ class AzureProviderDiskImage(ConfigValue):
self.pause = bool(image.get('pause', False))
self.python_path = image.get('python-path', 'auto')
self.shell_type = image.get('shell-type')
self.username = image.get('username')
self.username = image.get('username', diskimage.username)
self.password = image.get('password')
self.generate_password = image.get('generate-password', False)
self.key = image.get('key')