Merge "Use diskimage username in AWS and Azure drivers"

doc/source/aws.rst

@@ -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
 

doc/source/azure.rst

@@ -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
 

nodepool/driver/aws/config.py

@@ -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',

nodepool/driver/azure/config.py

@@ -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')