openstack
/
fuel-qa
Code Issues Proposed changes

Merge "Use admin node as DNS in system tests"

This commit is contained in:
Jenkins 2015-04-14 20:39:45 +00:00 committed by Gerrit Code Review
parent 64977f3620 f2f18f4e19
commit 6ba592d7da
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fuelweb_test/models/environment.py
View File

@ -229,6 +229,13 @@ class EnvironmentModel(object):
by_port=8000)
self.set_admin_ssh_password()
if not skip_timesync:
nailgun_nodes = [self.fuel_web.get_nailgun_node_by_name(node.name)
for node in self.d_env.nodes().slaves
if node.driver.node_active(node)]
self.sync_time(nailgun_nodes)
self.nailgun_actions.wait_for_ready_container()
try:
_wait(self.fuel_web.client.get_releases,
@ -237,12 +244,6 @@ class EnvironmentModel(object):
self.set_admin_keystone_password()
self.fuel_web.get_nailgun_version()
if not skip_timesync:
nailgun_nodes = [self.fuel_web.get_nailgun_node_by_name(node.name)
for node in self.d_env.nodes().slaves
if node.driver.node_active(node)]
self.sync_time(nailgun_nodes)
return True
def set_admin_ssh_password(self):

4
fuelweb_test/models/fuel_web_client.py
View File

@ -387,6 +387,10 @@ class FuelWebClient(object):
attributes['editable']['external_ntp']['ntp_list']['value'] =\
self.admin_node_ip
if help_data.FUEL_USE_LOCAL_DNS and ('dns_list' not in settings):
attributes['editable']['external_dns']['dns_list']['value'] =\
self.admin_node_ip
logger.info('Set DEBUG MODE to %s', help_data.DEBUG_MODE)
attributes['editable']['common']['debug']['value'] = \
help_data.DEBUG_MODE

1
fuelweb_test/settings.py
View File

@ -371,6 +371,7 @@ STORE_ASTUTE_YAML = os.environ.get('STORE_ASTUTE_YAML', 'false') == 'true'
EXTERNAL_DNS = os.environ.get('EXTERNAL_DNS', '208.67.220.220')
EXTERNAL_NTP = os.environ.get('EXTERNAL_NTP', 'ua.pool.ntp.org')
FUEL_USE_LOCAL_NTPD = os.environ.get('FUEL_USE_LOCAL_NTPD', 'true') == 'true'
FUEL_USE_LOCAL_DNS = os.environ.get('FUEL_USE_LOCAL_DNS', 'true') == 'true'
TIMESTAT_PATH_YAML = os.environ.get(
'TIMESTAT_PATH_YAML', os.path.join(