Fix netvirt csit-1node openstack jobs

Missed some job config during the openstack template migration for Heat.

Change-Id: Idb275a37ddde50fbe3f0801aa94ee96880887723
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml
index b15c82b6176ae8be2dd74d95d8660bf941533eda..7853df99ad7ce2f94668b2f33da838511bc3376c 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-1node-multi-openstack.yaml
@@ -30,19 +30,19 @@
             openstack-branch: 'stable/mitaka'
             odl-ml2-branch: 'stable/mitaka'
             odl-ml2-driver-version: 'v1'
-            openstack-image: 'centos7-devstack-mitaka-2c-8g'
+            openstack_system_image: CentOS 7 - devstack - mitaka - 20170106-2237
         - newton:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v1'
-            openstack-image: 'centos7-devstack-newton-2c-8g'
+            openstack_system_image: CentOS 7 - devstack - newton - 20170106-2237
         - newton-nodl-v2:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v2'
-            openstack-image: 'centos7-devstack-newton-2c-8g'
+            openstack_system_image: CentOS 7 - devstack - newton - 20170106-2237
 
-    openstack-vms: 3
+    openstack_system_count: 3
 
     install-features: 'odl-ovsdb-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
 

diff --git a/jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml
index a7961e57179f0fa8909016909d51e54974b7007c..432d04d2bfd02df2528d21b829368a55ca23f2b7 100644 (file)
--- a/jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-legacy-csit-3node-multi-openstack.yaml
@@ -29,17 +29,17 @@
             openstack-branch: 'stable/mitaka'
             odl-ml2-branch: 'stable/mitaka'
             odl-ml2-driver-version: 'v1'
-            openstack_system_image: 'CentOS 7 - devstack - mitaka - 20170106-2237'
+            openstack_system_image: CentOS 7 - devstack - mitaka - 20170106-2237
         - newton:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v1'
-            openstack_system_image: 'CentOS 7 - devstack - newton - 20170106-2237'
+            openstack_system_image: CentOS 7 - devstack - newton - 20170106-2237
         - newton-nodl-v2:
             openstack-branch: 'stable/newton'
             odl-ml2-branch: 'stable/newton'
             odl-ml2-driver-version: 'v2'
-            openstack_system_image: 'CentOS 7 - devstack - newton - 20170106-2237'
+            openstack_system_image: CentOS 7 - devstack - newton - 20170106-2237
 
     openstack_system_count: 4