openstack
/
fuel-qa
Code Issues Proposed changes

Merge "Upgrade primary controller first" into stable/mitaka

This commit is contained in:
Jenkins 2016-07-13 12:35:15 +00:00 committed by Gerrit Code Review
parent 04885c1444 8add90f9a1
commit 56cfb6fddf
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fuelweb_test/tests/test_os_upgrade.py
View File

@ -126,13 +126,18 @@ class TestOSupgrade(DataDrivenUpgradeBase):
seed_cluster_id = self.fuel_web.get_last_created_cluster()
self.show_step(3)
controllers = self.fuel_web.get_nailgun_cluster_nodes_by_roles(
self.orig_cluster_id, ["controller"])
controller = self.fuel_web.get_devops_node_by_nailgun_node(
self.fuel_web.get_nailgun_cluster_nodes_by_roles(
self.orig_cluster_id, ["controller"])[0])
primary = self.fuel_web.get_nailgun_node_by_devops_node(
self.fuel_web.get_nailgun_primary_node(controller)
)
self.show_step(4)
self.ssh_manager.execute_on_remote(
ip=self.ssh_manager.admin_ip,
cmd="octane upgrade-node --isolated "
"{0} {1}".format(seed_cluster_id, controllers[-1]["id"]),
"{0} {1}".format(seed_cluster_id, primary["id"]),
err_msg="octane upgrade-node failed")
self.show_step(5)