File 0001-tempest-Don-t-hardcode-external-network-id... of Package openstack-magnum

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-tempest-Don-t-hardcode-external-network-id.patch of Package openstack-magnum

From 1e829484f8036a19f3f26efa7b70f3c64dc482b5 Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Thu, 7 Jul 2016 16:49:48 +0200
Subject: [PATCH] tempest: Don't hardcode external network id

Not all environments call the external network "public".
There is already a tempest config option called "nic_id"
which can be used to name the external network.
Use this option.

Change-Id: I562f4cf548817325fbf613e9c8cc51fe51b3b3a1
---
 magnum/tests/functional/common/datagen.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/magnum/tests/functional/common/datagen.py b/magnum/tests/functional/common/datagen.py
index decd009..d3d1e7a 100644
--- a/magnum/tests/functional/common/datagen.py
+++ b/magnum/tests/functional/common/datagen.py
@@ -110,7 +110,7 @@ def baymodel_data(**kwargs):
         "dns_nameserver": "8.8.8.8",
         "flavor_id": data_utils.rand_name('bay'),
         "master_flavor_id": data_utils.rand_name('bay'),
-        "external_network_id": "public",
+        "external_network_id": config.Config.nic_id,
         "keypair_id": data_utils.rand_name('bay'),
         "image_id": data_utils.rand_name('bay')
     }
@@ -207,7 +207,7 @@ def valid_swarm_baymodel():
                          master_flavor_id=config.Config.master_flavor_id,
                          keypair_id=config.Config.keypair_id, coe="swarm",
                          docker_volume_size=3, cluster_distro=None,
-                         external_network_id="public",
+                         external_network_id=config.Config.nic_id,
                          http_proxy=None, https_proxy=None, no_proxy=None,
                          network_driver=None, volume_driver=None, labels={},
                          tls_disabled=False)
-- 
2.9.0

Places

File 0001-tempest-Don-t-hardcode-external-network-id.patch of Package openstack-magnum

Places