Remove unused baremetal provision workflow code
This code all has ansiblie equivalents now. Change-Id: Ib45cad1cdb17482bf4d8102c066e67f82c658558 Story: 2007212 Task: 38457
This commit is contained in:
Steve Baker
Kevin Carter
parent
1391a9273c
commit
a963409890
|
|
@ -744,137 +744,3 @@ class TestDiscoverNode(fakes.TestOvercloudNode):
|
|||
|
||||
parsed_args = self.check_parser(self.cmd, argslist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
|
||||
class TestProvisionNode(fakes.TestOvercloudNode):
|
||||
|
||||
def setUp(self):
|
||||
super(TestProvisionNode, self).setUp()
|
||||
|
||||
self.workflow = self.app.client_manager.workflow_engine
|
||||
execution = mock.Mock()
|
||||
execution.id = "IDID"
|
||||
self.workflow.executions.create.return_value = execution
|
||||
client = self.app.client_manager.tripleoclient
|
||||
self.websocket = client.messaging_websocket()
|
||||
self.websocket.wait_for_messages.return_value = [{
|
||||
"status": "SUCCESS",
|
||||
"message": "Success",
|
||||
"environment": {"cat": "meow"},
|
||||
"execution": {"id": "IDID"}
|
||||
}]
|
||||
|
||||
self.cmd = overcloud_node.ProvisionNode(self.app, None)
|
||||
|
||||
def test_ok(self):
|
||||
with tempfile.NamedTemporaryFile() as inp:
|
||||
with tempfile.NamedTemporaryFile() as outp:
|
||||
with tempfile.NamedTemporaryFile() as keyf:
|
||||
inp.write(b'- name: Compute\n- name: Controller\n')
|
||||
inp.flush()
|
||||
keyf.write(b'I am a key')
|
||||
keyf.flush()
|
||||
with open('{}.pub'.format(keyf.name), 'w') as f:
|
||||
f.write('I am a key')
|
||||
|
||||
argslist = ['--output', outp.name,
|
||||
'--overcloud-ssh-key', keyf.name,
|
||||
inp.name]
|
||||
verifylist = [('input', inp.name),
|
||||
('output', outp.name),
|
||||
('overcloud_ssh_key', keyf.name)]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd,
|
||||
argslist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
data = yaml.safe_load(outp)
|
||||
self.assertEqual({"cat": "meow"}, data)
|
||||
|
||||
self.workflow.executions.create.assert_called_once_with(
|
||||
'tripleo.baremetal_deploy.v1.deploy_roles',
|
||||
workflow_input={'roles': [{'name': 'Compute'},
|
||||
{'name': 'Controller'}],
|
||||
'plan': 'overcloud',
|
||||
'ssh_keys': ['I am a key'],
|
||||
'ssh_user_name': 'heat-admin',
|
||||
'concurrency': 20,
|
||||
'timeout': 3600}
|
||||
)
|
||||
|
||||
|
||||
class TestUnprovisionNode(fakes.TestOvercloudNode):
|
||||
|
||||
def setUp(self):
|
||||
super(TestUnprovisionNode, self).setUp()
|
||||
|
||||
self.workflow = self.app.client_manager.workflow_engine
|
||||
execution = mock.Mock()
|
||||
execution.id = "IDID"
|
||||
self.workflow.executions.create.return_value = execution
|
||||
client = self.app.client_manager.tripleoclient
|
||||
self.websocket = client.messaging_websocket()
|
||||
self.websocket.wait_for_messages.return_value = [{
|
||||
"status": "SUCCESS",
|
||||
"message": "Success",
|
||||
"environment": {"cat": "meow"},
|
||||
"execution": {"id": "IDID"}
|
||||
}]
|
||||
|
||||
self.cmd = overcloud_node.UnprovisionNode(self.app, None)
|
||||
|
||||
def test_ok(self):
|
||||
rv = mock.Mock()
|
||||
rv.output = json.dumps({
|
||||
'result': {
|
||||
'instances': [
|
||||
{'hostname': 'compute-0', 'name': 'baremetal-1'},
|
||||
{'hostname': 'controller-0', 'name': 'baremetal-2'}
|
||||
]
|
||||
}
|
||||
})
|
||||
|
||||
self.workflow.action_executions.create.return_value = rv
|
||||
with tempfile.NamedTemporaryFile() as inp:
|
||||
inp.write(b'- name: Compute\n- name: Controller\n')
|
||||
inp.flush()
|
||||
argslist = ['--yes', inp.name]
|
||||
verifylist = [('input', inp.name), ('yes', True)]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd,
|
||||
argslist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
def test_ok_all(self):
|
||||
rv = mock.Mock()
|
||||
rv.output = json.dumps({
|
||||
'result': {
|
||||
'instances': [
|
||||
{'hostname': 'compute-0', 'name': 'baremetal-1'},
|
||||
{'hostname': 'controller-0', 'name': 'baremetal-2'}
|
||||
]
|
||||
}
|
||||
})
|
||||
|
||||
rv_provisioned = mock.Mock()
|
||||
rv_provisioned.output = json.dumps({
|
||||
'result': {
|
||||
'instances': [
|
||||
{'hostname': 'compute-1', 'name': 'baremetal-3'},
|
||||
{'hostname': 'controller-1', 'name': 'baremetal-4'}
|
||||
]
|
||||
}
|
||||
})
|
||||
|
||||
self.workflow.action_executions.create.side_effect = [
|
||||
rv, rv_provisioned
|
||||
]
|
||||
with tempfile.NamedTemporaryFile() as inp:
|
||||
inp.write(b'- name: Compute\n- name: Controller\n')
|
||||
inp.flush()
|
||||
argslist = ['--all', '--yes', inp.name]
|
||||
verifylist = [('input', inp.name), ('yes', True), ('all', True)]
|
||||
|
||||
parsed_args = self.check_parser(self.cmd,
|
||||
argslist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ import collections
|
|||
import json
|
||||
import logging
|
||||
import os
|
||||
import sys
|
||||
|
||||
from cliff.formatters import table
|
||||
from osc_lib import exceptions as oscexc
|
||||
|
|
@ -427,167 +426,3 @@ class DiscoverNode(command.Command):
|
|||
baremetal.provide(self.app.client_manager,
|
||||
node_uuids=nodes_uuids
|
||||
)
|
||||
|
||||
|
||||
class ProvisionNode(command.Command):
|
||||
"""Provision new nodes using Ironic."""
|
||||
|
||||
log = logging.getLogger(__name__ + ".ProvisionNode")
|
||||
|
||||
def get_parser(self, prog_name):
|
||||
parser = super(ProvisionNode, self).get_parser(prog_name)
|
||||
parser.add_argument('input',
|
||||
metavar='<baremetal_deployment.yaml>',
|
||||
help=_('Configuration file describing the '
|
||||
'baremetal deployment'))
|
||||
parser.add_argument('-o', '--output',
|
||||
default='baremetal_environment.yaml',
|
||||
help=_('The output environment file path'))
|
||||
parser.add_argument('--stack', dest='stack',
|
||||
help=_('Name or ID of heat stack '
|
||||
'(default=Env: OVERCLOUD_STACK_NAME)'),
|
||||
default=utils.env('OVERCLOUD_STACK_NAME',
|
||||
default='overcloud'))
|
||||
|
||||
parser.add_argument('--overcloud-ssh-user',
|
||||
default='heat-admin',
|
||||
help=_('User for SSH access to newly deployed '
|
||||
'nodes'))
|
||||
parser.add_argument('--overcloud-ssh-key',
|
||||
default=None,
|
||||
help=_('Key path for ssh access to'
|
||||
' overcloud nodes. When undefined the key'
|
||||
' will be autodetected.'))
|
||||
parser.add_argument('--concurrency', type=int,
|
||||
default=20,
|
||||
help=_('Maximum number of nodes to provision at '
|
||||
'once. (default=20)'))
|
||||
parser.add_argument('--timeout', type=int,
|
||||
default=3600,
|
||||
help=_('Number of seconds to wait for the node '
|
||||
'provision to complete. (default=3600)'))
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
self.log.debug("take_action(%s)" % parsed_args)
|
||||
|
||||
with open(parsed_args.input, 'r') as fp:
|
||||
roles = yaml.safe_load(fp)
|
||||
|
||||
key = self.get_key_pair(parsed_args)
|
||||
with open('{}.pub'.format(key), 'rt') as fp:
|
||||
ssh_key = fp.read()
|
||||
|
||||
output = baremetal.deploy_roles(
|
||||
self.app.client_manager,
|
||||
plan=parsed_args.stack,
|
||||
roles=roles,
|
||||
ssh_keys=[ssh_key],
|
||||
ssh_user_name=parsed_args.overcloud_ssh_user,
|
||||
concurrency=parsed_args.concurrency,
|
||||
timeout=parsed_args.timeout
|
||||
)
|
||||
|
||||
with open(parsed_args.output, 'w') as fp:
|
||||
yaml.safe_dump(output['environment'], fp, default_flow_style=False)
|
||||
|
||||
print('Nodes deployed successfully, add %s to your deployment '
|
||||
'environment' % parsed_args.output)
|
||||
|
||||
|
||||
class UnprovisionNode(command.Command):
|
||||
"""Unprovisions nodes using Ironic."""
|
||||
|
||||
log = logging.getLogger(__name__ + ".UnprovisionNode")
|
||||
|
||||
def get_parser(self, prog_name):
|
||||
parser = super(UnprovisionNode, self).get_parser(prog_name)
|
||||
parser.add_argument('--stack', dest='stack',
|
||||
help=_('Name or ID of heat stack '
|
||||
'(default=Env: OVERCLOUD_STACK_NAME)'),
|
||||
default=utils.env('OVERCLOUD_STACK_NAME',
|
||||
default='overcloud'))
|
||||
parser.add_argument('--all',
|
||||
help=_('Unprovision every instance in the '
|
||||
'deployment'),
|
||||
default=False,
|
||||
action="store_true")
|
||||
parser.add_argument('-y', '--yes',
|
||||
help=_('Skip yes/no prompt (assume yes)'),
|
||||
default=False,
|
||||
action="store_true")
|
||||
parser.add_argument('input',
|
||||
metavar='<baremetal_deployment.yaml>',
|
||||
help=_('Configuration file describing the '
|
||||
'baremetal deployment'))
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
self.log.debug("take_action(%s)" % parsed_args)
|
||||
|
||||
with open(parsed_args.input, 'r') as fp:
|
||||
roles = yaml.safe_load(fp)
|
||||
|
||||
nodes = []
|
||||
expanded = baremetal.expand_roles(
|
||||
self.app.client_manager,
|
||||
roles=roles,
|
||||
stackname=parsed_args.stack,
|
||||
provisioned=False)
|
||||
nodes.extend(expanded.get('instances', []))
|
||||
|
||||
if parsed_args.all:
|
||||
expanded = baremetal.expand_roles(
|
||||
self.app.client_manager,
|
||||
roles=roles,
|
||||
stackname=parsed_args.stack,
|
||||
provisioned=True)
|
||||
nodes.extend(expanded.get('instances', []))
|
||||
|
||||
if not nodes:
|
||||
print('No nodes to unprovision')
|
||||
return
|
||||
|
||||
self._print_nodes(nodes)
|
||||
|
||||
if not parsed_args.yes:
|
||||
confirm = oooutils.prompt_user_for_confirmation(
|
||||
message=_("Are you sure you want to unprovision these %s "
|
||||
"nodes [y/N]? ") % parsed_args.stack,
|
||||
logger=self.log)
|
||||
if not confirm:
|
||||
raise oscexc.CommandError("Action not confirmed, exiting.")
|
||||
unprovision_role = self._build_unprovision_role(nodes)
|
||||
print('Unprovisioning %d nodes' % len(nodes))
|
||||
baremetal.undeploy_roles(
|
||||
self.app.client_manager,
|
||||
roles=unprovision_role,
|
||||
plan=parsed_args.stack)
|
||||
|
||||
print('Unprovision complete')
|
||||
|
||||
def _build_unprovision_role(self, nodes):
|
||||
# build a fake role called Unprovisioned which has an instance
|
||||
# entry for every node to be unprovisioned
|
||||
instances = [{'hostname': n['hostname'], 'provisioned': False}
|
||||
for n in nodes if 'hostname' in n]
|
||||
return [{
|
||||
'name': 'Unprovisioned',
|
||||
'count': 0,
|
||||
'instances': instances
|
||||
}]
|
||||
|
||||
def _print_nodes(self, nodes):
|
||||
TableArgs = collections.namedtuple(
|
||||
'TableArgs', 'print_empty max_width fit_width')
|
||||
args = TableArgs(print_empty=True, max_width=80, fit_width=True)
|
||||
nodes_data = [(i.get('hostname', ''),
|
||||
i.get('name', '')) for i in nodes]
|
||||
|
||||
formatter = table.TableFormatter()
|
||||
formatter.emit_list(
|
||||
column_names=['hostname', 'name'],
|
||||
data=nodes_data,
|
||||
stdout=sys.stdout,
|
||||
parsed_args=args
|
||||
)
|
||||
|
|
|
|||
|
|
@ -17,12 +17,10 @@ from __future__ import print_function
|
|||
import six
|
||||
|
||||
from tripleo_common.actions import baremetal
|
||||
from tripleo_common.actions import baremetal_deploy
|
||||
|
||||
from tripleoclient import constants
|
||||
from tripleoclient import exceptions
|
||||
from tripleoclient import utils
|
||||
from tripleoclient.workflows import base
|
||||
|
||||
|
||||
def validate_nodes(clients, nodes_json):
|
||||
|
|
@ -509,87 +507,3 @@ def reset_bios_configuration_on_manageable_nodes(clients, **workflow_input):
|
|||
if i.provision_state == "manageable" and not i.maintenance
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
def deploy_roles(clients, **workflow_input):
|
||||
"""Deploy provided roles using Ironic.
|
||||
|
||||
Run the tripleo.baremetal_deploy.v1.deploy_roles Mistral workflow.
|
||||
"""
|
||||
|
||||
workflow_client = clients.workflow_engine
|
||||
tripleoclients = clients.tripleoclient
|
||||
|
||||
with tripleoclients.messaging_websocket() as ws:
|
||||
execution = base.start_workflow(
|
||||
workflow_client,
|
||||
'tripleo.baremetal_deploy.v1.deploy_roles',
|
||||
workflow_input=workflow_input
|
||||
)
|
||||
|
||||
for payload in base.wait_for_messages(workflow_client, ws, execution):
|
||||
if payload.get('message'):
|
||||
print(payload['message'])
|
||||
|
||||
if payload['status'] != 'SUCCESS':
|
||||
raise exceptions.NodeConfigurationError(
|
||||
'Error deploying nodes: {}'.format(payload['message']))
|
||||
|
||||
return payload
|
||||
|
||||
|
||||
def expand_roles(clients, roles, stackname, provisioned):
|
||||
"""Convert a baremetal_deployment file to list of instances.
|
||||
|
||||
:param clients: application client object.
|
||||
:type clients: Object
|
||||
|
||||
:param roles: List of roles to undeploy.
|
||||
:type roles: List
|
||||
|
||||
:param stackname: Name of plan / stack.
|
||||
:type stackname: String
|
||||
|
||||
:param provisioned: Enable or Disable the provisioned flag.
|
||||
:type provisioned: Boolean
|
||||
|
||||
:returns: Dictionary
|
||||
"""
|
||||
|
||||
context = clients.tripleoclient.create_mistral_context()
|
||||
expand = baremetal_deploy.ExpandRolesAction(
|
||||
roles=roles,
|
||||
stackname=stackname,
|
||||
provisioned=provisioned
|
||||
).run(context=context)
|
||||
if not isinstance(expand, dict):
|
||||
raise RuntimeError(expand)
|
||||
else:
|
||||
return expand
|
||||
|
||||
|
||||
def undeploy_roles(clients, roles, plan):
|
||||
"""Undeploy provided roles using Ironic.
|
||||
|
||||
:param clients: application client object.
|
||||
:type clients: Object
|
||||
|
||||
:param roles: List of roles to undeploy.
|
||||
:type roles: List
|
||||
|
||||
:param plan: Name of plan / stack.
|
||||
:type plan: String
|
||||
"""
|
||||
|
||||
expanded_roles = expand_roles(
|
||||
clients=clients,
|
||||
roles=roles,
|
||||
stackname=plan,
|
||||
provisioned=True
|
||||
)
|
||||
|
||||
context = clients.tripleoclient.create_mistral_context()
|
||||
for instance in expanded_roles['instances']:
|
||||
baremetal_deploy.UndeployInstanceAction(
|
||||
instance=instance
|
||||
).run(context=context)
|
||||
|
|
|
|||
Loading…
Reference in New Issue