- allow rerunning of infrared tobiko configure tasks

- also set external net name according to osp version
- fix the string bug when using multiple words
with --tests : http://pastebin.test.redhat.com/773150
Change-Id: I1d217f179be13498bb5f21b777d39636292da835

infrared/tasks/configure.yml

@@ -12,6 +12,8 @@
 - name: Set up Overcloud resources create cirros img
   shell: |
     source "{{ test.overcloudrc }}"
+    openstack image list --status active --limit 1 -f value -c Name| \
+    grep -q -w cirros || \
     openstack image create cirros \
       --file cirros-0.4.0-x86_64-disk.img \
       --disk-format qcow2 \
@@ -21,6 +23,7 @@
 - name: Set up Overcloud resources create m.tiny flavor
   shell: |
     source "{{ test.overcloudrc }}"
+    openstack flavor list --limit 1 -f value -c Name|grep -q -w 'm1.tiny' || \
     openstack flavor create --vcpus 1 --ram 64 --disk 1 m1.tiny
 
 - name: Set up Overcloud resources create ssh keys

infrared/tasks/run.yml

@@ -3,4 +3,4 @@
       cd "{{ test.dir }}"
       source "{{ test.overcloudrc }}"
       source "{{ test.venv }}/bin/activate"
-      tox -e "{{ test.tests }}"
+      tox -e {{ test.tests }}

infrared/tasks/templates/tobiko.conf.j2

@@ -5,6 +5,6 @@ log_dir = .
 [nova]
 image = cirros
 flavor = m1.tiny
-key_file=~/.ssh/id_rsa
+key_file = ~/.ssh/id_rsa
 [neutron]
-floating_network = public
+floating_network = "{{ test.external_net }}"

plugin.spec

@@ -31,6 +31,11 @@ subparsers:
                       default: "{{ ansible_env.HOME }}/tobiko_venv"
                       help: |
                           path of existing virtual environment
+                  external_net:
+                      type: Value
+                      default: "public"
+                      help: |
+                          Name of overcloud's external-net
                   tests:
                       type: Value
                       help: |