summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuby Loo <ruby.loo@intel.com>2016-09-19 15:45:42 -0400
committerRuby Loo <ruby.loo@intel.com>2016-09-19 15:45:42 -0400
commit66fc750a00198c98603ae0489fa4ec7201648696 (patch)
tree80a9bdc7218ff8ef0c4160c6a6d618b7a35393bd
parent091ac2b01282352c80ea26c7120a78fbac1e0203 (diff)
downloadironic-66fc750a00198c98603ae0489fa4ec7201648696.tar.gz
Remove duplicated line wrt configdrive
The commit 1027c1bc44912fcbfb9f842fedef39c9067632f8 introduced a line that was already being done (line 1212). This removes the duplicated line. Change-Id: I0d05ecb1236dc68995f47204b686fe398b177f79 Partial-Bug: #1493328
-rw-r--r--ironic/drivers/modules/deploy_utils.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/ironic/drivers/modules/deploy_utils.py b/ironic/drivers/modules/deploy_utils.py
index f8354647d..32bb16deb 100644
--- a/ironic/drivers/modules/deploy_utils.py
+++ b/ironic/drivers/modules/deploy_utils.py
@@ -1187,7 +1187,6 @@ def parse_instance_info(node):
# ensuring that it is possible
i_info['swap_mb'] = info.get('swap_mb', 0)
i_info['ephemeral_gb'] = info.get('ephemeral_gb', 0)
- i_info['configdrive'] = info.get('configdrive')
err_msg_invalid = _("Cannot validate parameter for driver deploy. "
"Invalid parameter %(param)s. Reason: %(reason)s")
for param in DISK_LAYOUT_PARAMS: