zuul
/
nodepool
Code Issues Proposed changes

Default config-drive to true 

As we depend more and more on glean to help bootstrap a node, it is
possible for new clouds added to nodepool.yaml to be missing the
setting. Which results is broken nodes and multiple configuration
updates.

As a result, we now default config-drive to true to make it easier to
bring nodes online.

Change-Id: I4e214ba7bc43a59ddffb4bfb50576ab3b96acf69
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-08-01 16:54:49 -04:00
parent 0b8bc65474
commit f1dfb117b0
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
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

@ -510,7 +510,7 @@ Example::
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

@ -207,7 +207,7 @@ def loadConfig(config_path):
i.user_home = image.get('user-home', '/home/jenkins')
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)
# note this does "double-duty" -- for
# SnapshotImageUpdater the meta-data dict is passed to

2
nodepool/provider_manager.py
View File

@ -179,7 +179,7 @@ class ProviderManager(TaskManager):
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: