From 4631a01096396e6e2186b31049b5a4a2a895a80e Mon Sep 17 00:00:00 2001 From: vic Date: Sun, 24 Feb 2013 06:19:42 +0400 Subject: [PATCH] Route public interface --- fuel_test/ci/ci_cobbler.py | 6 ++++-- fuel_test/settings.py | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/fuel_test/ci/ci_cobbler.py b/fuel_test/ci/ci_cobbler.py index a16d93da58..d78b1a73c7 100644 --- a/fuel_test/ci/ci_cobbler.py +++ b/fuel_test/ci/ci_cobbler.py @@ -7,7 +7,8 @@ from fuel_test.ci.ci_base import CiBase from fuel_test.node_roles import NodeRoles from fuel_test.settings import CONTROLLERS, COMPUTES,\ STORAGES, PROXIES,\ - EMPTY_SNAPSHOT, POOLS, INTERFACE_ORDER + EMPTY_SNAPSHOT, POOLS, INTERFACE_ORDER, ROUTED_INTERFACE + class CiCobbler(CiBase): def node_roles(self): @@ -41,7 +42,8 @@ class CiCobbler(CiBase): pool = self.manager.create_network_pool( networks=[network], prefix=int(new_prefix)) networks.append(self.manager.network_create( - name=name, environment=environment, pool=pool)) + name=name, environment=environment, pool=pool, + forward='route' if name==ROUTED_INTERFACE else 'nat')) for name in self.node_roles().master_names + self.node_roles().cobbler_names + self.node_roles().stomp_names: self.describe_node(name, networks) for name in self.node_roles().compute_names: diff --git a/fuel_test/settings.py b/fuel_test/settings.py index ebc0e3f6a7..594d499146 100644 --- a/fuel_test/settings.py +++ b/fuel_test/settings.py @@ -67,6 +67,7 @@ EMPTY_SNAPSHOT = os.environ.get('EMPTY_SNAPSHOT', 'empty') OPENSTACK_SNAPSHOT = os.environ.get('OPENSTACK_SNAPSHOT', 'openstack') INTERFACE_ORDER = ('public', 'internal', 'private') +ROUTED_INTERFACE = 'public' INTERFACES = { 'public': 'eth0', @@ -95,3 +96,5 @@ POOLS = { 'internal': os.environ.get('INTERNAL_POOL', DEFAULT_POOLS.get(OS_FAMILY).get('internal')).split(':') } + +