Skip to content
Permalink
Browse files

Merge "Fix _associate_floating_ip() conflict"

  • Loading branch information...
Zuul authored and openstack-gerrit committed Jun 28, 2019
2 parents 1b79d77 + 1f28a44 commit 10cb29749dd21aabd98a316c0f38868bdeef6853
Showing with 2 additions and 2 deletions.
  1. +2 −2 rally/rally-plugins/netcreate-boot/netcreate_nova_boot_fip_ping.py
@@ -26,8 +26,8 @@
@scenario.configure(context={"cleanup@openstack": ["neutron", "nova"], "keypair@openstack": {},
"allow_ssh@openstack": None},
name="BrowbeatPlugin.create_network_nova_boot_ping", platform="openstack")
class CreateNetworkNovaBootPing(neutron_utils.NeutronScenario,
vm_utils.VMScenario):
class CreateNetworkNovaBootPing(vm_utils.VMScenario,
neutron_utils.NeutronScenario):

def run(self, image, flavor, ext_net_id, router_create_args=None,
network_create_args=None, subnet_create_args=None, **kwargs):

0 comments on commit 10cb297

Please sign in to comment.
You can’t perform that action at this time.