From f1dfb117b029d8612035db783860843f463944ee Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Mon, 1 Aug 2016 16:54:49 -0400 Subject: [PATCH] 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 --- doc/source/configuration.rst | 2 +- nodepool/config.py | 2 +- nodepool/provider_manager.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 6b09d60e3..e73a22753 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -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 diff --git a/nodepool/config.py b/nodepool/config.py index 590330328..d60eefc4a 100644 --- a/nodepool/config.py +++ b/nodepool/config.py @@ -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 diff --git a/nodepool/provider_manager.py b/nodepool/provider_manager.py index 4a25dd031..24f2ac219 100644 --- a/nodepool/provider_manager.py +++ b/nodepool/provider_manager.py @@ -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: