diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-21 23:29:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-21 23:29:17 +0000 |
| commit | e30cc8506f3b5d8c5d6b6279d5899a4cfe6fc59b (patch) | |
| tree | 8574d6461eae670895fba51d321cd55b21250a7d /ironic | |
| parent | 4b5d69ffcf58cd8e044e2738b05791034da2e34a (diff) | |
| parent | 866e70d743441809efc86965bf154a6730f74289 (diff) | |
| download | ironic-e30cc8506f3b5d8c5d6b6279d5899a4cfe6fc59b.tar.gz | |
Merge "Fix final comments in RAID commits"
Diffstat (limited to 'ironic')
| -rw-r--r-- | ironic/drivers/modules/agent.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ironic/drivers/modules/agent.py b/ironic/drivers/modules/agent.py index 17eaaa7e1..308eb568a 100644 --- a/ironic/drivers/modules/agent.py +++ b/ironic/drivers/modules/agent.py @@ -472,13 +472,12 @@ class AgentRAID(base.RAIDInterface): _("Node %s has no target RAID configuration.") % node.uuid) target_raid_config = node.target_raid_config.copy() - error_msg = None error_msg_list = [] if not create_root_volume: target_raid_config['logical_disks'] = [ x for x in target_raid_config['logical_disks'] - if x.get('is_root_volume', False) is False] + if not x.get('is_root_volume')] error_msg_list.append(_("skipping root volume")) if not create_nonroot_volumes: @@ -486,7 +485,7 @@ class AgentRAID(base.RAIDInterface): target_raid_config['logical_disks'] = [ x for x in target_raid_config['logical_disks'] - if x.get('is_root_volume', False) is True] + if x.get('is_root_volume')] if not target_raid_config['logical_disks']: error_msg = _(' and ').join(error_msg_list) |