zuul
/
nodepool
Code Issues Proposed changes

Merge "Default config-drive to true"

This commit is contained in:
Jenkins 2017-03-15 17:36:22 +00:00 committed by Gerrit Code Review
parent 60103bda5e f1dfb117b0
commit 30c4b46b48
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/configuration.rst
View File

@ -551,7 +551,7 @@ Example configuration::
Default ``/var/lib/jenkins/.ssh/id_rsa``
``config-drive`` (boolean)
Whether config drive should be used for the image.
Whether config drive should be used for the image. Default ``True``
``meta`` (dict)
Arbitrary key/value metadata to store for this server using the Nova

2
nodepool/config.py
View File

@ -241,7 +241,7 @@ def loadConfig(config_path):
i.pause = bool(image.get('pause', False))
i.private_key = image.get('private-key',
'/var/lib/jenkins/.ssh/id_rsa')
i.config_drive = image.get('config-drive', None)
i.config_drive = image.get('config-drive', True)
# This dict is expanded and used as custom properties when
# the image is uploaded.

2
nodepool/provider_manager.py
View File

@ -185,7 +185,7 @@ class ProviderManager(object):
def createServer(self, name, min_ram, image_id=None, image_name=None,
az=None, key_name=None, name_filter=None,
config_drive=None, nodepool_node_id=None,
config_drive=True, nodepool_node_id=None,
nodepool_image_name=None,
nodepool_snapshot_image_id=None):
if image_name: