Update server_kwargs to boot_server_kwargs

It takes into account "Remove deprecated stuff. Part 1" [1] and then fixes
rally_sanity and rally_full
(NovaKeypair.boot_and_delete_server_with_keypair [2])

[1] https://github.com/openstack/rally-openstack/commit/4436258d8fbb758a1771f908726e78c29e309c8a#diff-a80e66732701c545c7fc540d02ee1066
[2] http://artifacts.opnfv.org/functest/HG7XUW226S1T/functest-opnfv-functest-smoke-latest-rally_sanity-run-687/rally_sanity/rally_sanity.html#/NovaKeypair.boot_and_delete_server_with_keypair/failures

Change-Id: Id39b3231153efcccd58ed6bd988e26e2a672825b
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit fef6bbb60e00b9246a4a5f7e7dc07db3db0eaa9f)

diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml
index 8ef5b6c..79f1502 100644 (file)
--- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml
+++ b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-nova.yaml
@@ -251,7 +251,7 @@
     -
       args:
         {{ vm_params(image_name, flavor_name) }}
-        server_kwargs:
+        boot_server_kwargs:
             nics:
               - net-id: {{ netid }}
       context:

diff --git a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml
index 935f384..27c51a5 100644 (file)
--- a/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml
+++ b/functest/opnfv_tests/openstack/rally/scenario/sanity/opnfv-nova.yaml
@@ -50,7 +50,7 @@
     -
       args:
         {{ vm_params(image_name, flavor_name) }}
-        server_kwargs:
+        boot_server_kwargs:
             nics:
               - net-id: {{ netid }}
       context: