From 57b0af579b6ca2dbe79ee4f111e069d0dfad57fe Mon Sep 17 00:00:00 2001
From: jkilpatr <jkilpatr@redhat.com>
Date: Tue, 28 Mar 2017 13:41:44 -0400
Subject: [PATCH] Nova CI scenarios should use auto_assign_nic

https://review.openstack.org/#/c/450493/2 is better than grepping
out a net id.

Change-Id: I438c424aaf62fbf79eef77b7bcd53017285da0a9
---
 ansible/oooq/roles/template-configs/tasks/main.yml            | 4 ----
 .../roles/template-configs/templates/browbeat-api-ci.yaml.j2  | 2 --
 .../roles/template-configs/templates/browbeat-basic.yaml.j2   | 1 -
 3 files changed, 7 deletions(-)

diff --git a/ansible/oooq/roles/template-configs/tasks/main.yml b/ansible/oooq/roles/template-configs/tasks/main.yml
index dd1b5d935..94999d61d 100644
--- a/ansible/oooq/roles/template-configs/tasks/main.yml
+++ b/ansible/oooq/roles/template-configs/tasks/main.yml
@@ -1,8 +1,4 @@
 ---
-- name: Get Network ID
-  shell: "source {{ ansible_env.HOME }}/overcloudrc; neutron net-list | grep {{ browbeat_pri_net_name }} | cut -f 2 -d'|'"
-  register: nova_test_net_name
-
 - name: Template Browbeat configuration
   template:
     "src={{ browbeat_config_file }} \
diff --git a/ansible/oooq/roles/template-configs/templates/browbeat-api-ci.yaml.j2 b/ansible/oooq/roles/template-configs/templates/browbeat-api-ci.yaml.j2
index 74edeea29..7bed182cf 100644
--- a/ansible/oooq/roles/template-configs/templates/browbeat-api-ci.yaml.j2
+++ b/ansible/oooq/roles/template-configs/templates/browbeat-api-ci.yaml.j2
@@ -101,13 +101,11 @@ rally:
           file: rally/nova/nova-boot-snapshot-cc.yml
           image_name: cirros
           flavor_name: m1.tiny
-          net_id: {{ nova_test_net_name.stdout }}
         - name: boot-list
           enabled: true
           file: rally/nova/nova-boot-list-cc.yml
           image_name: cirros
           flavor_name: m1.tiny
-          net_id: {{ nova_test_net_name.stdout }}
     - name: glance
       enabled: true
       concurrency:
diff --git a/ansible/oooq/roles/template-configs/templates/browbeat-basic.yaml.j2 b/ansible/oooq/roles/template-configs/templates/browbeat-basic.yaml.j2
index 19064409b..be1d65e67 100644
--- a/ansible/oooq/roles/template-configs/templates/browbeat-basic.yaml.j2
+++ b/ansible/oooq/roles/template-configs/templates/browbeat-basic.yaml.j2
@@ -128,7 +128,6 @@ rally:
           file: rally/nova/nova-boot-snapshot-cc.yml
           image_name: cirros
           flavor_name: m1.tiny
-          net_id: {{ nova_test_net_name.stdout }}
     - name: plugins
       enabled: true
       concurrency: