Remove checks for boot_option

Setting boot_option_local is no longer required as its the default.

Remove the check on ironic nodes for this capability and change the
warning message issued if capabilities:boot_option is set too
netboot on flavors.

Change-Id: I9fbe12f7878328f0ca084e29483f30d18dad1773
Related-Bug: #1803965
This commit is contained in:
Derek Higgins 2018-11-19 10:28:20 +00:00
parent 2a8ae42216
commit ecc06e9cbc
3 changed files with 3 additions and 9 deletions

View File

@ -31,9 +31,3 @@
fail: msg='Node {{ item.uuid }} has an incorrectly configured driver_info/deploy_ramdisk. Expected "{{ deploy_ramdisk_id }}" but got "{{ item.driver_info.deploy_ramdisk }}".'
failed_when: item.driver_info.deploy_ramdisk != deploy_ramdisk_id
with_items: "{{ ironic_nodes }}"
- name: Check capabilities
fail: msg='Node {{ item.uuid }} is not configured to use boot_option:local in capabilities. It will not be used for deployment with flavors that require boot_option:local.'
failed_when: item.properties.capabilities | default('') | regex_search('boot_option:local') == ''
with_items: "{{ ironic_nodes }}"
ignore_errors: true

View File

@ -23,8 +23,8 @@ module: check_flavors
short_description: Check that assigned flavors exist and are configured
description:
- Validate that the flavors assigned to roles exist and have the correct
settings. Right now, that means that boot_option is set to 'local', or
if set to 'netboot', issue a warning.
settings. Right now, that means that boot_option is unset or set to 'local'
, or if set to 'netboot', issue a warning.
options:
roles_info:
required: true

View File

@ -125,7 +125,7 @@ def verify_profiles(nodes, flavors):
'{flavor}).\n'
'Recommendation: tag more nodes using openstack '
'baremetal node set --property "capabilities='
'profile:{profile},boot_option:local" <NODE ID>')
'profile:{profile}" <NODE ID>')
errors.append(message.format(total=scale - required_count,
scale=scale,
profile=profile,