commit d61c949f07b855565fba7de8df1c3c48480ff611
author Jenkins <jenkins@review.openstack.org> Wed Apr 08 20:47:37 2015 +0000
committer Gerrit Code Review <review@openstack.org> Wed Apr 08 20:47:37 2015 +0000
tree 0bd5327b1e9d0895ee241b77611bb9cdde4c1918
parent 839567cc0bea198d9cb1412bb39f3c617199dcf9
parent 9350a107b1c8783bb905b0853475c8a94069ad8a

Merge "Allows selection of floating IP pool in Javelin"

tempest/cmd/javelin.py

diff --git a/tempest/cmd/javelin.py b/tempest/cmd/javelin.py
index c945a46..fec3bd4 100755
--- a/tempest/cmd/javelin.py
+++ b/tempest/cmd/javelin.py
@@ -86,6 +86,7 @@
       owner: javelin
       flavor: m1.small
       image: javelin_cirros
+      floating_ip_pool: public
     - name: hoplite
       owner: javelin
       flavor: m1.medium
@@ -859,7 +860,9 @@
         for secgroup in server['secgroups']:
             client.servers.add_security_group(server_id, secgroup)
         if CONF.compute.use_floatingip_for_ssh:
-            floating_ip = client.floating_ips.create_floating_ip()
+            floating_ip_pool = server.get('floating_ip_pool')
+            floating_ip = client.floating_ips.create_floating_ip(
+                pool_name=floating_ip_pool)
             client.floating_ips.associate_floating_ip_to_server(
                 floating_ip['ip'], server_id)