openstack/fuel-library
Code Issues Proposed changes

Bypass puppet version from test

Browse Source
This commit is contained in:
vic
2013-05-24 16:30:23 +04:00
parent 14e48093b3
commit 68ac316e4c
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fuel_test/cobbler/vm_test_case.py
View File

@@ -8,7 +8,7 @@ from fuel_test.cobbler.cobbler_client import CobblerClient
from fuel_test.config import Config
from fuel_test.helpers import tcp_ping, udp_ping, add_to_hosts, await_node_deploy, write_config
from fuel_test.manifest import Manifest
from fuel_test.settings import CLEAN, USE_ISO, INTERFACES, PARENT_PROXY, DOMAIN_NAME, CURRENT_PROFILE
from fuel_test.settings import CLEAN, USE_ISO, INTERFACES, PARENT_PROXY, DOMAIN_NAME, CURRENT_PROFILE, PUPPET_VERSION
class CobblerTestCase(BaseTestCase):
@@ -43,7 +43,8 @@ class CobblerTestCase(BaseTestCase):
mirror_type='custom',
external_ip="",
external_mask="",
parent_proxy=PARENT_PROXY))
parent_proxy=PARENT_PROXY,
puppet_master_version=PUPPET_VERSION))
self.remote().execute("/usr/local/sbin/bootstrap_admin_node.sh --batch-mode")
self.prepare_cobbler_environment()
self.environment().revert('nodes-deployed')

7
fuel_test/iso_master.py
View File

@@ -3,7 +3,7 @@ from unittest import TestCase
def get_config(hostname, domain, management_interface, management_ip,
management_mask, external_interface, external_ip, external_mask,
dhcp_start_address, dhcp_end_address, mirror_type, parent_proxy):
dhcp_start_address, dhcp_end_address, mirror_type, parent_proxy, puppet_master_version):
return _get_config(hostname=hostname,
domain=domain,
mgmt_if=management_interface,
@@ -15,7 +15,8 @@ def get_config(hostname, domain, management_interface, management_ip,
dhcp_start_address=dhcp_start_address,
dhcp_end_address=dhcp_end_address,
mirror_type=mirror_type,
parent_proxy=parent_proxy)
parent_proxy=parent_proxy,
puppet_master_version=puppet_master_version)
def _get_config(**kwargs):
@@ -27,4 +28,4 @@ class SelfTest(TestCase):
print get_config(hostname='fuel-pm', domain='local', management_interface='eth0', management_ip='10.0.0.100',
management_mask='255.255.255.0', external_interface='eth1', dhcp_start_address='10.0.0.201',
dhcp_end_address='10.0.0.254', mirror_type='iso', external_ip='asdf', external_mask='asdff',
parent_proxy="1.2.3.4:3128")
parent_proxy="1.2.3.4:3128", puppet_master_version='3.0.1')