Remove Old baremetal commands provided by python-tripleoclient
python-tripleoclient provides the following openstack baremetal
commands:
openstack baremetal instackenv validate:
openstack baremetal import:
openstack baremetal introspection bulk start:
openstack baremetal introspection bulk status:
openstack baremetal configure ready state:
openstack baremetal configure boot:
Based on the data below several of these are already deprecated and have
been so longer enough to be removed.
openstack baremetal instackenv validate:
tripleoclient.v1.baremetal:ValidateInstackEnv
NOT Deprecated
openstack baremetal import:
tripleoclient.v1.baremetal:ImportBaremetal
DEPRECATED in b272a5c6 2017-01-03
New command: openstack overcloud node import
openstack baremetal introspection bulk start:
tripleoclient.v1.baremetal:StartBaremetalIntrospectionBulk
DEPRECATED in b272a5c6 2017-01-03
New command: openstack overcloud node introspect
openstack baremetal introspection bulk status:
tripleoclient.v1.baremetal:StatusBaremetalIntrospectionBulk
NOT Deprecated
openstack baremetal configure ready state:
tripleoclient.v1.baremetal:ConfigureReadyState
NOT Deprecated
openstack baremetal configure boot:
tripleoclient.v1.baremetal:ConfigureBaremetalBoot
DEPRECATED in b272a5c6 2017-01-03
New command: openstack overcloud node configure
This leaves:
openstack baremetal instackenv validate
- This is somewhat superceded by the mistral validation in
tripleo-common
openstack baremetal introspection bulk status
- This should have been deprecated along with
'openstack baremetal introspection bulk start' and isn't useful without
the former.
openstack baremetal configure ready state
- Seems to only support drac and requires a datafile no loner generated
by tools
As these commands have outlived their useful lifetime and do not require
deprecation we're free to remove them so let do it.
Change-Id: Ie6b6a8578e4d12503a3dbfa5747309033d53466e
This commit is contained in:
Tony Breeds
parent
bdee8afc9b
commit
ada02718a1
@ -57,12 +57,6 @@ openstack.cli.extension =
|
|||||||
tripleoclient = tripleoclient.plugin
|
tripleoclient = tripleoclient.plugin
|
||||||
|
|
||||||
openstack.tripleoclient.v1 =
|
openstack.tripleoclient.v1 =
|
||||||
baremetal_instackenv_validate = tripleoclient.v1.baremetal:ValidateInstackEnv
|
|
||||||
baremetal_import = tripleoclient.v1.baremetal:ImportBaremetal
|
|
||||||
baremetal_introspection_bulk_start = tripleoclient.v1.baremetal:StartBaremetalIntrospectionBulk
|
|
||||||
baremetal_introspection_bulk_status = tripleoclient.v1.baremetal:StatusBaremetalIntrospectionBulk
|
|
||||||
baremetal_configure_ready_state = tripleoclient.v1.baremetal:ConfigureReadyState
|
|
||||||
baremetal_configure_boot = tripleoclient.v1.baremetal:ConfigureBaremetalBoot
|
|
||||||
overcloud_netenv_validate = tripleoclient.v1.overcloud_netenv_validate:ValidateOvercloudNetenv
|
overcloud_netenv_validate = tripleoclient.v1.overcloud_netenv_validate:ValidateOvercloudNetenv
|
||||||
overcloud_config_download = tripleoclient.v1.overcloud_config:DownloadConfig
|
overcloud_config_download = tripleoclient.v1.overcloud_config:DownloadConfig
|
||||||
overcloud_container_image_upload = tripleoclient.v1.container_image:UploadImage
|
overcloud_container_image_upload = tripleoclient.v1.container_image:UploadImage
|
||||||
|
|||||||
@ -19,56 +19,6 @@ import ironic_inspector_client
|
|||||||
from osc_lib.tests import utils
|
from osc_lib.tests import utils
|
||||||
|
|
||||||
|
|
||||||
class FakeBaremetalNodeClient(object):
|
|
||||||
def __init__(self, states={}, transitions={}, transition_errors={}):
|
|
||||||
"""Create a new test double for the "baremetal node" command.
|
|
||||||
|
|
||||||
:param states: dictionary of nodes' initial states. Keys are uuids and
|
|
||||||
values are states, eg {"ABC: "available"}.
|
|
||||||
:param transitions: dictionary of expected state transitions.
|
|
||||||
Keys are (uuid, transition) pairs, and values are
|
|
||||||
the states nodes end up in after that transition,
|
|
||||||
eg {("ABC", "manage"): "manageable"}.
|
|
||||||
Updates which occur are stored in "updates" for
|
|
||||||
later inspection.
|
|
||||||
:param transition_errors: dict of errors caused by state transitions.
|
|
||||||
Keys are (uuid, transition) pairs, and values
|
|
||||||
are the value of node.last_error after that
|
|
||||||
transition,
|
|
||||||
eg {("ABC", "manage"): "Node on fire."}.
|
|
||||||
"""
|
|
||||||
self.states = states
|
|
||||||
self.transitions = transitions
|
|
||||||
self.transition_errors = transition_errors
|
|
||||||
self.last_errors = {}
|
|
||||||
self.updates = [] # inspect this to see which transitions occurred
|
|
||||||
|
|
||||||
def set_provision_state(self, node_uuid, transition):
|
|
||||||
key = (node_uuid, transition)
|
|
||||||
new_state = self.transitions[key]
|
|
||||||
self.states[node_uuid] = new_state
|
|
||||||
self.last_errors[node_uuid] = self.transition_errors.get(key, None)
|
|
||||||
self.updates.append(key)
|
|
||||||
|
|
||||||
def _get(self, uuid, detail=False, **kwargs):
|
|
||||||
mock_node = mock.Mock(uuid=uuid, provision_state=self.states[uuid])
|
|
||||||
if detail:
|
|
||||||
mock_node.last_error = self.last_errors.get(uuid, None)
|
|
||||||
else:
|
|
||||||
mock_node.mock_add_spec(
|
|
||||||
('instance_uuid', 'maintenance', 'power_state',
|
|
||||||
'provision_state', 'uuid', 'name'),
|
|
||||||
spec_set=True)
|
|
||||||
return mock_node
|
|
||||||
|
|
||||||
def get(self, uuid):
|
|
||||||
return self._get(uuid, detail=True)
|
|
||||||
|
|
||||||
def list(self, *args, **kwargs):
|
|
||||||
return [self._get(uuid, **kwargs)
|
|
||||||
for uuid in (sorted(self.states.keys()))]
|
|
||||||
|
|
||||||
|
|
||||||
class FakeInspectorClient(object):
|
class FakeInspectorClient(object):
|
||||||
def __init__(self, states=None, data=None):
|
def __init__(self, states=None, data=None):
|
||||||
self.states = states or {}
|
self.states = states or {}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1592,7 +1592,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
|
|||||||
autospec=True)
|
autospec=True)
|
||||||
@mock.patch('tripleoclient.utils.wait_for_provision_state')
|
@mock.patch('tripleoclient.utils.wait_for_provision_state')
|
||||||
@mock.patch('tripleoclient.workflows.baremetal', autospec=True)
|
@mock.patch('tripleoclient.workflows.baremetal', autospec=True)
|
||||||
@mock.patch('tripleoclient.v1.baremetal', autospec=True)
|
|
||||||
@mock.patch('tripleoclient.utils.get_overcloud_endpoint', autospec=True)
|
@mock.patch('tripleoclient.utils.get_overcloud_endpoint', autospec=True)
|
||||||
@mock.patch('tripleoclient.utils.write_overcloudrc', autospec=True)
|
@mock.patch('tripleoclient.utils.write_overcloudrc', autospec=True)
|
||||||
@mock.patch('tripleoclient.workflows.deployment.overcloudrc',
|
@mock.patch('tripleoclient.workflows.deployment.overcloudrc',
|
||||||
@ -1602,7 +1601,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
|
|||||||
def test_deployed_server(self, mock_deploy_tmpdir, mock_overcloudrc,
|
def test_deployed_server(self, mock_deploy_tmpdir, mock_overcloudrc,
|
||||||
mock_write_overcloudrc,
|
mock_write_overcloudrc,
|
||||||
mock_get_overcloud_endpoint,
|
mock_get_overcloud_endpoint,
|
||||||
mock_baremetal, mock_workflows_bm,
|
mock_workflows_bm,
|
||||||
mock_provision, mock_tempest_deploy_input,
|
mock_provision, mock_tempest_deploy_input,
|
||||||
mock_get_horizon_url):
|
mock_get_horizon_url):
|
||||||
arglist = ['--templates', '--deployed-server', '--disable-validations']
|
arglist = ['--templates', '--deployed-server', '--disable-validations']
|
||||||
|
|||||||
@ -1,447 +0,0 @@
|
|||||||
# Copyright 2015 Red Hat, Inc.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
||||||
# not use this file except in compliance with the License. You may obtain
|
|
||||||
# a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
# License for the specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
#
|
|
||||||
|
|
||||||
from __future__ import print_function
|
|
||||||
|
|
||||||
import argparse
|
|
||||||
import logging
|
|
||||||
import simplejson
|
|
||||||
import time
|
|
||||||
|
|
||||||
import ironic_inspector_client
|
|
||||||
from osc_lib.i18n import _
|
|
||||||
|
|
||||||
from tripleoclient import command
|
|
||||||
from tripleoclient import exceptions
|
|
||||||
from tripleoclient import utils
|
|
||||||
from tripleoclient.workflows import baremetal
|
|
||||||
|
|
||||||
|
|
||||||
class ValidateInstackEnv(command.Command):
|
|
||||||
"""Validate `instackenv.json` which is used in `baremetal import`."""
|
|
||||||
|
|
||||||
auth_required = False
|
|
||||||
log = logging.getLogger(__name__ + ".ValidateInstackEnv")
|
|
||||||
|
|
||||||
def get_parser(self, prog_name):
|
|
||||||
parser = super(ValidateInstackEnv, self).get_parser(prog_name)
|
|
||||||
parser.add_argument(
|
|
||||||
'-f', '--file', dest='instackenv',
|
|
||||||
help=_("Path to the instackenv.json file."),
|
|
||||||
default='instackenv.json')
|
|
||||||
return parser
|
|
||||||
|
|
||||||
def take_action(self, parsed_args):
|
|
||||||
self.log.debug("take_action(%s)" % parsed_args)
|
|
||||||
|
|
||||||
self.error_count = 0
|
|
||||||
|
|
||||||
with open(parsed_args.instackenv, 'r') as net_file:
|
|
||||||
env_data = simplejson.load(net_file)
|
|
||||||
|
|
||||||
maclist = []
|
|
||||||
baremetal_ips = []
|
|
||||||
for node in env_data['nodes']:
|
|
||||||
self.log.info("Checking node %s" % node['pm_addr'])
|
|
||||||
|
|
||||||
try:
|
|
||||||
if len(node['pm_password']) == 0:
|
|
||||||
self.log.error('ERROR: Password 0 length.')
|
|
||||||
self.error_count += 1
|
|
||||||
except Exception as e:
|
|
||||||
self.log.error('ERROR: Password does not exist: %s', e)
|
|
||||||
self.error_count += 1
|
|
||||||
try:
|
|
||||||
if len(node['pm_user']) == 0:
|
|
||||||
self.log.error('ERROR: User 0 length.')
|
|
||||||
self.error_count += 1
|
|
||||||
except Exception as e:
|
|
||||||
self.log.error('ERROR: User does not exist: %s', e)
|
|
||||||
self.error_count += 1
|
|
||||||
try:
|
|
||||||
if len(node['mac']) == 0:
|
|
||||||
self.log.error('ERROR: MAC address 0 length.')
|
|
||||||
self.error_count += 1
|
|
||||||
maclist.extend(node['mac'])
|
|
||||||
except Exception as e:
|
|
||||||
self.log.error('ERROR: MAC address does not exist: %s', e)
|
|
||||||
self.error_count += 1
|
|
||||||
|
|
||||||
if node['pm_type'] == "pxe_ssh":
|
|
||||||
self.log.debug("Identified virtual node")
|
|
||||||
|
|
||||||
if node['pm_type'] == "pxe_ipmitool":
|
|
||||||
self.log.debug("Identified baremetal node")
|
|
||||||
|
|
||||||
cmd = ('ipmitool -R 1 -I lanplus -H %s -U %s -P %s chassis '
|
|
||||||
'status' % (node['pm_addr'], node['pm_user'],
|
|
||||||
node['pm_password']))
|
|
||||||
self.log.debug("Executing: %s", cmd)
|
|
||||||
status = utils.run_shell(cmd)
|
|
||||||
if status != 0:
|
|
||||||
self.log.error('ERROR: ipmitool failed')
|
|
||||||
self.error_count += 1
|
|
||||||
baremetal_ips.append(node['pm_addr'])
|
|
||||||
|
|
||||||
if not utils.all_unique(baremetal_ips):
|
|
||||||
self.log.error('ERROR: Baremetals IPs are not all unique.')
|
|
||||||
self.error_count += 1
|
|
||||||
else:
|
|
||||||
self.log.debug('Baremetal IPs are all unique.')
|
|
||||||
|
|
||||||
if not utils.all_unique(maclist):
|
|
||||||
self.log.error('ERROR: MAC addresses are not all unique.')
|
|
||||||
self.error_count += 1
|
|
||||||
else:
|
|
||||||
self.log.debug('MAC addresses are all unique.')
|
|
||||||
|
|
||||||
if self.error_count == 0:
|
|
||||||
print('SUCCESS: found 0 errors')
|
|
||||||
else:
|
|
||||||
print('FAILURE: found %d errors' % self.error_count)
|
|
||||||
|
|
||||||
|
|
||||||
class ImportBaremetal(command.Command):
|
|
||||||
"""Import baremetal nodes from a JSON, YAML or CSV file (DEPRECATED).
|
|
||||||
|
|
||||||
Please use 'openstack overcloud node import' instead.
|
|
||||||
"""
|
|
||||||
|
|
||||||
log = logging.getLogger(__name__ + ".ImportBaremetal")
|
|
||||||
|
|
||||||
def get_parser(self, prog_name):
|
|
||||||
parser = super(ImportBaremetal, self).get_parser(prog_name)
|
|
||||||
parser.add_argument('-s', '--service-host', dest='service_host',
|
|
||||||
help=_('Deprecated, this argument has no impact.'))
|
|
||||||
parser.add_argument(
|
|
||||||
'--json', dest='json', action='store_true',
|
|
||||||
help=_('Deprecated, now detected via file extension.'))
|
|
||||||
parser.add_argument(
|
|
||||||
'--csv', dest='csv', action='store_true',
|
|
||||||
help=_('Deprecated, now detected via file extension.'))
|
|
||||||
parser.add_argument('--deploy-kernel',
|
|
||||||
default='bm-deploy-kernel',
|
|
||||||
help=_('Image with deploy kernel.'))
|
|
||||||
parser.add_argument('--deploy-ramdisk',
|
|
||||||
default='bm-deploy-ramdisk',
|
|
||||||
help=_('Image with deploy ramdisk.'))
|
|
||||||
parser.add_argument('--no-deploy-image', action='store_true',
|
|
||||||
help=_('Skip setting the deploy kernel and '
|
|
||||||
'ramdisk.'))
|
|
||||||
parser.add_argument('--instance-boot-option',
|
|
||||||
choices=['local', 'netboot'], default='local',
|
|
||||||
help=_('Whether to set instances for booting from '
|
|
||||||
'local hard drive (local) or network '
|
|
||||||
'(netboot).'))
|
|
||||||
parser.add_argument('file_in', type=argparse.FileType('r'))
|
|
||||||
parser.add_argument(
|
|
||||||
'--initial-state',
|
|
||||||
choices=['enroll', 'manageable', 'available'],
|
|
||||||
default='available',
|
|
||||||
help=_('Provision state for newly-enrolled nodes.')
|
|
||||||
)
|
|
||||||
|
|
||||||
return parser
|
|
||||||
|
|
||||||
def take_action(self, parsed_args):
|
|
||||||
|
|
||||||
self.log.debug("take_action(%s)" % parsed_args)
|
|
||||||
self.log.warning('This command is deprecated. Please use "openstack '
|
|
||||||
'overcloud node import" to register nodes instead.')
|
|
||||||
|
|
||||||
file_type = None
|
|
||||||
if parsed_args.json:
|
|
||||||
file_type = 'json'
|
|
||||||
elif parsed_args.csv:
|
|
||||||
file_type = 'csv'
|
|
||||||
|
|
||||||
nodes_config = utils.parse_env_file(parsed_args.file_in, file_type)
|
|
||||||
|
|
||||||
client = self.app.client_manager.baremetal
|
|
||||||
if parsed_args.initial_state == "enroll":
|
|
||||||
api_version = client.http_client.os_ironic_api_version
|
|
||||||
if [int(part) for part in api_version.split('.')] < [1, 11]:
|
|
||||||
raise exceptions.InvalidConfiguration(
|
|
||||||
_("OS_BAREMETAL_API_VERSION must be >=1.11 for use of "
|
|
||||||
"'enroll' provision state; currently %s") % api_version)
|
|
||||||
|
|
||||||
if parsed_args.no_deploy_image:
|
|
||||||
deploy_kernel = None
|
|
||||||
deploy_ramdisk = None
|
|
||||||
else:
|
|
||||||
deploy_kernel = parsed_args.deploy_kernel
|
|
||||||
deploy_ramdisk = parsed_args.deploy_ramdisk
|
|
||||||
|
|
||||||
baremetal.register_or_update(
|
|
||||||
self.app.client_manager,
|
|
||||||
nodes_json=nodes_config,
|
|
||||||
kernel_name=deploy_kernel,
|
|
||||||
ramdisk_name=deploy_ramdisk,
|
|
||||||
instance_boot_option=parsed_args.instance_boot_option,
|
|
||||||
initial_state=parsed_args.initial_state,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class StartBaremetalIntrospectionBulk(command.Command):
|
|
||||||
"""Start bulk introspection on all baremetal nodes (DEPRECATED).
|
|
||||||
|
|
||||||
Please use 'openstack overcloud node introspect' instead. The nodes
|
|
||||||
should be in 'manageable' state before running the command.
|
|
||||||
"""
|
|
||||||
|
|
||||||
log = logging.getLogger(__name__ + ".StartBaremetalIntrospectionBulk")
|
|
||||||
|
|
||||||
def get_parser(self, prog_name):
|
|
||||||
parser = super(StartBaremetalIntrospectionBulk, self).get_parser(
|
|
||||||
prog_name)
|
|
||||||
parser.add_argument('--run-validations', action='store_true',
|
|
||||||
default=False,
|
|
||||||
help=_('Run the pre-deployment validations. These '
|
|
||||||
'external validations are from the TripleO '
|
|
||||||
'Validations project.'))
|
|
||||||
return parser
|
|
||||||
|
|
||||||
def take_action(self, parsed_args):
|
|
||||||
|
|
||||||
self.log.debug("take_action(%s)" % parsed_args)
|
|
||||||
self.log.warning('This command is deprecated. Please use "openstack '
|
|
||||||
'overcloud node introspect" to introspect manageable '
|
|
||||||
'nodes instead.')
|
|
||||||
|
|
||||||
clients = self.app.client_manager
|
|
||||||
client = self.app.client_manager.baremetal
|
|
||||||
|
|
||||||
# TODO(d0ugal): We don't yet have a workflow to move from available
|
|
||||||
# or enroll to manageable. Once we do, this should be switched over.
|
|
||||||
print("Setting nodes for introspection to manageable...")
|
|
||||||
self.log.debug("Moving available/enroll nodes to manageable state.")
|
|
||||||
available_nodes = utils.nodes_in_states(client, ("available",
|
|
||||||
"enroll"))
|
|
||||||
for node_uuid in utils.set_nodes_state(client, available_nodes,
|
|
||||||
'manage', 'manageable'):
|
|
||||||
self.log.debug(
|
|
||||||
"Node {0} has been set to manageable.".format(node_uuid))
|
|
||||||
|
|
||||||
print("Starting introspection of manageable nodes")
|
|
||||||
baremetal.introspect_manageable_nodes(
|
|
||||||
clients,
|
|
||||||
run_validations=parsed_args.run_validations
|
|
||||||
)
|
|
||||||
print("Setting manageable nodes to available...")
|
|
||||||
self.log.debug("Moving manageable nodes to available state.")
|
|
||||||
|
|
||||||
baremetal.provide_manageable_nodes(clients)
|
|
||||||
|
|
||||||
|
|
||||||
class StatusBaremetalIntrospectionBulk(command.Lister):
|
|
||||||
"""Get the status of all baremetal nodes"""
|
|
||||||
|
|
||||||
log = logging.getLogger(__name__ + ".StatusBaremetalIntrospectionBulk")
|
|
||||||
|
|
||||||
def take_action(self, parsed_args):
|
|
||||||
|
|
||||||
self.log.debug("take_action(%s)" % parsed_args)
|
|
||||||
client = self.app.client_manager.baremetal
|
|
||||||
inspector_client = self.app.client_manager.baremetal_introspection
|
|
||||||
|
|
||||||
statuses = []
|
|
||||||
|
|
||||||
for node in client.node.list():
|
|
||||||
self.log.debug("Getting introspection status of Ironic node {0}"
|
|
||||||
.format(node.uuid))
|
|
||||||
|
|
||||||
try:
|
|
||||||
status = inspector_client.get_status(node.uuid)
|
|
||||||
except ironic_inspector_client.ClientError as exc:
|
|
||||||
# This API returns an error when the node was never
|
|
||||||
# introspected before. Exclude it from output in this case.
|
|
||||||
self.log.debug('Introspection status for node %(node)s '
|
|
||||||
'returned error %(exc)s',
|
|
||||||
{'node': node.uuid, 'exc': exc})
|
|
||||||
else:
|
|
||||||
statuses.append((node.uuid, status))
|
|
||||||
|
|
||||||
return (
|
|
||||||
("Node UUID", "Finished", "Error"),
|
|
||||||
list((node_uuid, status['finished'], status['error'])
|
|
||||||
for (node_uuid, status) in statuses)
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class ConfigureReadyState(command.Command):
|
|
||||||
"""Configure all baremetal nodes for enrollment"""
|
|
||||||
|
|
||||||
log = logging.getLogger(__name__ + ".ConfigureReadyState")
|
|
||||||
sleep_time = 15
|
|
||||||
loops = 120
|
|
||||||
|
|
||||||
def _configure_bios(self, nodes):
|
|
||||||
nodes_with_reboot_request = set()
|
|
||||||
|
|
||||||
for node, profile in nodes:
|
|
||||||
if (profile in self.ready_state_config and
|
|
||||||
'bios_settings' in self.ready_state_config[profile]):
|
|
||||||
|
|
||||||
print("Configuring BIOS for node {0}".format(node.uuid))
|
|
||||||
settings = self.ready_state_config[profile]['bios_settings']
|
|
||||||
resp = self.bm_client.node.vendor_passthru(
|
|
||||||
node.uuid, 'set_bios_config', http_method='POST',
|
|
||||||
args=settings)
|
|
||||||
|
|
||||||
if resp.commit_required:
|
|
||||||
nodes_with_reboot_request.add(node)
|
|
||||||
self.bm_client.node.vendor_passthru(
|
|
||||||
node.uuid, 'commit_bios_config', http_method='POST')
|
|
||||||
|
|
||||||
# NOTE(ifarkas): give the DRAC card some time to process the job
|
|
||||||
time.sleep(self.sleep_time)
|
|
||||||
|
|
||||||
return nodes_with_reboot_request
|
|
||||||
|
|
||||||
def _wait_for_drac_config_jobs(self, nodes):
|
|
||||||
for node in nodes:
|
|
||||||
print("Waiting for DRAC config jobs to finish on node {0}"
|
|
||||||
.format(node.uuid))
|
|
||||||
|
|
||||||
for _r in range(self.loops):
|
|
||||||
resp = self.bm_client.node.vendor_passthru(
|
|
||||||
node.uuid, 'list_unfinished_jobs', http_method='GET')
|
|
||||||
if not resp.unfinished_jobs:
|
|
||||||
break
|
|
||||||
|
|
||||||
time.sleep(self.sleep_time)
|
|
||||||
else:
|
|
||||||
msg = ("Timed out waiting for DRAC config jobs on node {0}"
|
|
||||||
.format(node.uuid))
|
|
||||||
raise exceptions.Timeout(msg)
|
|
||||||
|
|
||||||
def _change_power_state(self, nodes, target_power_state):
|
|
||||||
for node in nodes:
|
|
||||||
print("Changing power state on "
|
|
||||||
"node {0} to {1}".format(node.uuid, target_power_state))
|
|
||||||
self.bm_client.node.set_power_state(node.uuid, target_power_state)
|
|
||||||
|
|
||||||
def _apply_changes(self, nodes):
|
|
||||||
self._change_power_state(nodes, 'reboot')
|
|
||||||
self._wait_for_drac_config_jobs(nodes)
|
|
||||||
|
|
||||||
def get_parser(self, prog_name):
|
|
||||||
parser = super(ConfigureReadyState, self).get_parser(prog_name)
|
|
||||||
parser.add_argument('file', help=_('JSON file containing the '
|
|
||||||
'ready-state configuration for each profile'))
|
|
||||||
|
|
||||||
return parser
|
|
||||||
|
|
||||||
def take_action(self, parsed_args):
|
|
||||||
self.log.debug("take_action(%s)" % parsed_args)
|
|
||||||
|
|
||||||
self.bm_client = self.app.client_manager.baremetal
|
|
||||||
|
|
||||||
with open(parsed_args.file, 'r') as fp:
|
|
||||||
self.ready_state_config = simplejson.load(fp)
|
|
||||||
|
|
||||||
drac_nodes = []
|
|
||||||
for node in self.bm_client.node.list(detail=True):
|
|
||||||
if 'drac' not in node.driver:
|
|
||||||
continue
|
|
||||||
|
|
||||||
selected_profile = utils.node_get_capabilities(node).get('profile')
|
|
||||||
if selected_profile is None:
|
|
||||||
continue
|
|
||||||
|
|
||||||
drac_nodes.append((node, selected_profile))
|
|
||||||
|
|
||||||
changed_nodes = self._configure_bios(drac_nodes)
|
|
||||||
self._apply_changes(changed_nodes)
|
|
||||||
|
|
||||||
self._change_power_state([node for node, profile in drac_nodes], 'off')
|
|
||||||
|
|
||||||
|
|
||||||
class ConfigureBaremetalBoot(command.Command):
|
|
||||||
"""Configure baremetal boot for all nodes (DEPRECATED).
|
|
||||||
|
|
||||||
Please use 'openstack overcloud node configure' instead.
|
|
||||||
"""
|
|
||||||
|
|
||||||
log = logging.getLogger(__name__ + ".ConfigureBaremetalBoot")
|
|
||||||
loops = 12
|
|
||||||
sleep_time = 10
|
|
||||||
|
|
||||||
def get_parser(self, prog_name):
|
|
||||||
parser = super(ConfigureBaremetalBoot, self).get_parser(prog_name)
|
|
||||||
parser.add_argument('--deploy-kernel',
|
|
||||||
default='bm-deploy-kernel',
|
|
||||||
help=_('Image with deploy kernel.'))
|
|
||||||
parser.add_argument('--deploy-ramdisk',
|
|
||||||
default='bm-deploy-ramdisk',
|
|
||||||
help=_('Image with deploy ramdisk.'))
|
|
||||||
parser.add_argument('--root-device',
|
|
||||||
help=_('Define the root device for nodes. '
|
|
||||||
'Can be either a list of device names '
|
|
||||||
'(without /dev) to choose from or one of '
|
|
||||||
'two strategies: largest or smallest. For '
|
|
||||||
'it to work this command should be run '
|
|
||||||
'after the introspection.'))
|
|
||||||
parser.add_argument('--root-device-minimum-size',
|
|
||||||
type=int, default=4,
|
|
||||||
help=_('Minimum size (in GiB) of the detected '
|
|
||||||
'root device. Used with --root-device.'))
|
|
||||||
parser.add_argument('--overwrite-root-device-hints',
|
|
||||||
action='store_true',
|
|
||||||
help=_('Whether to overwrite existing root device '
|
|
||||||
'hints when --root-device is used.'))
|
|
||||||
return parser
|
|
||||||
|
|
||||||
def take_action(self, parsed_args):
|
|
||||||
|
|
||||||
self.log.debug("take_action(%s)" % parsed_args)
|
|
||||||
self.log.warning('This command is deprecated. Please use "openstack '
|
|
||||||
'overcloud node configure" to configure manageable '
|
|
||||||
'nodes instead.')
|
|
||||||
|
|
||||||
bm_client = self.app.client_manager.baremetal
|
|
||||||
|
|
||||||
for node in bm_client.node.list(maintenance=False):
|
|
||||||
# NOTE(bnemec): Ironic won't let us update the node while the
|
|
||||||
# power_state is transitioning.
|
|
||||||
# Make sure we have the current node state, and not a cached one
|
|
||||||
# from the list call above, which may have happened minutes ago.
|
|
||||||
node_detail = bm_client.node.get(node.uuid)
|
|
||||||
if node_detail.power_state is None:
|
|
||||||
self.log.warning('Node %s power state is in transition. '
|
|
||||||
'Waiting up to %d seconds for it to '
|
|
||||||
'complete.',
|
|
||||||
node_detail.uuid,
|
|
||||||
self.loops * self.sleep_time)
|
|
||||||
for _r in range(self.loops):
|
|
||||||
time.sleep(self.sleep_time)
|
|
||||||
node_detail = bm_client.node.get(node.uuid)
|
|
||||||
if node_detail.power_state is not None:
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
msg = ('Timed out waiting for node %s power state.' %
|
|
||||||
node.uuid)
|
|
||||||
raise exceptions.Timeout(msg)
|
|
||||||
|
|
||||||
baremetal.configure(
|
|
||||||
self.app.client_manager,
|
|
||||||
node_uuids=[node.uuid],
|
|
||||||
kernel_name=parsed_args.deploy_kernel,
|
|
||||||
ramdisk_name=parsed_args.deploy_ramdisk,
|
|
||||||
root_device=parsed_args.root_device,
|
|
||||||
root_device_minimum_size=parsed_args.root_device_minimum_size,
|
|
||||||
overwrite_root_device_hints=(
|
|
||||||
parsed_args.overwrite_root_device_hints)
|
|
||||||
)
|
|
||||||
Loading…
Reference in New Issue
Block a user