openstack
/
fuel-octane
Code Issues Proposed changes

Remove copy folder with patches to nailgun container 

because Fuel 9.0 doesn't use docker containers

Change-Id: Ie25f31f1bfde73e9d9ace3a76a9789b76ddbf255
Partial-bug:1602590
This commit is contained in:
Anastasiya 2016-07-22 11:52:12 +03:00 committed by Artur Svechnikov
parent f817210c52
commit dbcc7eec0e
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
octane/commands/upgrade_node.py
View File

@ -66,10 +66,6 @@ def upgrade_node(env_id, node_ids, isolated=False, network_template=None,
network_template_data = load_network_template(network_template)
check_sanity(env_id, nodes)
# NOTE(ogelbukh): patches and scripts copied to nailgun container
# for later use
copy_patches_folder_to_nailgun()
call_handlers = upgrade_handlers.get_nodes_handlers(
nodes, env, isolated, live_migration)
with patch.applied_patch(

3
octane/tests/test_upgrade_node.py
View File

@ -67,8 +67,6 @@ def test_upgrade_node(mocker, node_ids, isolated, network_template,
mocker.patch("octane.util.patch.applied_patch")
mock_node = mocker.patch("fuelclient.objects.node.Node")
mock_node.side_effect = _create_node
mock_copy_patches = mocker.patch(
"octane.commands.upgrade_node.copy_patches_folder_to_nailgun")
mock_get_handlers = mocker.patch(
"octane.handlers.upgrade.get_nodes_handlers")
mock_handlers = mock_get_handlers.return_value
@ -80,7 +78,6 @@ def test_upgrade_node(mocker, node_ids, isolated, network_template,
mock_deploy_changes = mocker.patch("octane.util.env.deploy_changes")
upgrade_node.upgrade_node(test_env_id, node_ids)
mock_copy_patches.assert_called_once_with()
mock_copy_vips.assert_called_once_with(mock_env)
mock_move_nodes.assert_called_once_with(mock_env, mock_nodes_list,
True, None)