From 301b0c44609d2d563d5cd06dd773f50553dccb05 Mon Sep 17 00:00:00 2001 From: Nuno Santos Date: Thu, 17 Nov 2016 13:33:52 -0500 Subject: [PATCH] Add floating-network-name config option Added a new configuration option to allow for setting the name of the floating IP network. Defaults to ext-net. Change-Id: I71baa14e27b2e3dea88faeede9c65b0c9d8693fa --- src/config.yaml | 4 ++++ src/lib/charm/openstack/tempest.py | 7 +++++++ src/templates/tempest.conf | 1 + 3 files changed, 12 insertions(+) diff --git a/src/config.yaml b/src/config.yaml index 0e18a21..d743416 100644 --- a/src/config.yaml +++ b/src/config.yaml @@ -39,6 +39,10 @@ options: type: string default: "ext_net" description: "neutron network" + floating-network-name: + type: string + default: "ext-net" + description: "floating IP network" swift-resource-ip: type: string default: diff --git a/src/lib/charm/openstack/tempest.py b/src/lib/charm/openstack/tempest.py index 6b26ab2..c84b4fb 100644 --- a/src/lib/charm/openstack/tempest.py +++ b/src/lib/charm/openstack/tempest.py @@ -161,6 +161,13 @@ class TempestAdminAdapter(adapters.OpenStackRelationAdapter): else: network = networks['networks'][0] network_info['public_network_id'] = network['id'] + networks = neutron_client.list_networks( + name=self.uconfig['floating-network-name']) + if len(networks['networks']) == 0: + hookenv.log("Floating network name not found") + else: + network_info['floating-network-name'] = \ + self.uconfig['floating-network-name'] except: hookenv.log("Neutron is not ready, deferring neutron query") return network_info diff --git a/src/templates/tempest.conf b/src/templates/tempest.conf index 6f3ad3f..666a6da 100644 --- a/src/templates/tempest.conf +++ b/src/templates/tempest.conf @@ -62,6 +62,7 @@ public_network_id={{ identity_admin.network_info.public_network_id }} dns_servers={{ options.name_server }} {% endif -%} tenant_networks_reachable = false +floating_network_name={{ identity_admin.network_info.floating_network_name }} [network-feature-enabled] ipv6=false [object-storage]