Allow fuel-qa to install clean 9.0 Fuel master node

Nailgun package is installing by puppet manifests which are running
when mos9.0-updates repo is enabled by bootstrap_admin_node.sh
We have to disable it again for using local fuel's repo.
Also move restriction for FORCE_DISABLE_UPDATES with UPDATE_MASTER
to init method.

Change-Id: I9828f4741457b269e82e1eb128f6332dab8f6b61
Related-bug:1641931
This commit is contained in:
Vladimir Khlyunev 2016-11-17 10:59:31 +03:00
parent 32666f8f22
commit 8ef1ad1fac
2 changed files with 10 additions and 3 deletions

View File

@ -440,6 +440,13 @@ class EnvironmentModel(six.with_metaclass(SingletonMeta, object)):
# wait while installation complete
self.admin_actions.modify_configs(self.d_env.router())
# following "disable" required for clean 9.0 installation
cmd = "yum-config-manager --disable mos9.0-* --save"
self.ssh_manager.check_call(
ip=self.ssh_manager.admin_ip,
command=cmd
)
self.kill_wait_for_external_config()
self.wait_bootstrap()
self.admin_actions.wait_for_fuel_ready()

View File

@ -56,6 +56,9 @@ class TestBasic(object):
self.__fuel_constants = {
'rabbit_pcs_name': 'p_rabbitmq-server'
}
if settings.FORCE_DISABLE_UPDATES and settings.UPDATE_MASTER:
raise EnvironmentError(
"Cannot use FORCE_DISABLE_UPDATES and UPDATE_MASTER together")
@property
def fuel_constants(self):
@ -180,9 +183,6 @@ class TestBasic(object):
self.env.set_admin_keystone_password()
self.env.sync_time(['admin'])
if settings.FORCE_DISABLE_UPDATES and settings.UPDATE_MASTER:
raise EnvironmentError(
"Cannot use FORCE_DISABLE_UPDATES and UPDATE_MASTER together")
if settings.FORCE_DISABLE_UPDATES:
cmd = "yum-config-manager --disable mos9.0-* --save"
self.ssh_manager.check_call(