openstack
/
fuel-qa
Code Issues Proposed changes

Merge "Remove --admin-password argument from upgrade-ceph command" into stable/newton

This commit is contained in:
Jenkins 2016-12-06 12:10:01 +00:00 committed by Gerrit Code Review
parent 797e963ba1 28ff7a4c5d
commit 0bf094ec1e
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuelweb_test/tests/tests_upgrade/upgrade_base.py
View File

@ -30,7 +30,6 @@ import six
from fuelweb_test import logger
from fuelweb_test.helpers.utils import YamlEditor
from fuelweb_test.settings import KEYSTONE_CREDS
from fuelweb_test.settings import OPENSTACK_RELEASE
from fuelweb_test.settings import OPENSTACK_RELEASE_UBUNTU
from fuelweb_test.settings import UPGRADE_FUEL_FROM
@ -391,8 +390,7 @@ class OSUpgradeBase(DataDrivenUpgradeBase):
self.show_step(self.next_step)
self.ssh_manager.check_call(
ip=self.ssh_manager.admin_ip,
command="octane upgrade-osd --admin-password {0} {1} {2}".format(
KEYSTONE_CREDS['password'],
command="octane upgrade-osd {0} {1}".format(
self.orig_cluster_id,
seed_cluster_id),
error_info="octane upgrade-osd failed"