[CVP] Align cvp-configuration 2018.4.0 branch with OS Pike release
Change-Id: Id2cc15cd649c2d2474d6a71a9f00ae10eebe8171
Related-PROD: PROD-29899
diff --git a/rally/rally_scenarios_full.json b/rally/rally_scenarios_full.json
index bdcc277..4097c7c 100644
--- a/rally/rally_scenarios_full.json
+++ b/rally/rally_scenarios_full.json
@@ -11,6 +11,8 @@
{% set tenants = 3 %}
{% set rbd_image = "/home/rally/cvp-configuration/cirros-0.3.4-x86_64-disk.img" %}
{% set heat_template = "/home/rally/cvp-configuration/rally/default.yaml.template" %}
+{% set ext_net_name = "floating" %}
+{% set script_file = script_file or "/home/rally/cvp-configuration/rally/instance_test.sh" %}
{
"KeystoneBasic.authenticate_user_and_validate_token": [
{
@@ -41,7 +43,11 @@
"users": {
"users_per_tenant": {{users}},
"tenants": {{tenants}}
- }
+ },
+ "api_versions@openstack":
+ {
+ "cinder": {"service_type": "volumev3"}
+ }
},
"sla": {
"failure_rate": {
@@ -142,6 +148,46 @@
}
}
],
+ "VMTasks.boot_runcommand_delete": [
+ {
+ "args": {
+ "flavor": {
+ "name": "{{flavor_name_ubuntu}}"
+ },
+ "image": {
+ "name": "{{image_name_ubuntu}}"
+ },
+ "volume_args": {
+ "size": 10
+ },
+ "floating_network": "{{ext_net_name}}",
+ "use_floating_ip": true,
+ "wait_for_ping": false,
+ "force_delete": false,
+ "command": {
+ "interpreter": "/bin/sh",
+ "script_file": "{{script_file}}"
+ },
+ "username": "ubuntu"
+ },
+ "runner": {
+ "type": "constant",
+ "times": 1,
+ "concurrency": 1
+ },
+ "context": {
+ "users": {
+ "tenants": 1,
+ "users_per_tenant": 1
+ },
+ "api_versions@openstack":
+ {
+ "cinder": {"service_type": "volumev3"}
+ },
+ "network": {}
+ }
+ }
+ ],
"NovaServers.boot_and_migrate_server": [
{
"args": {
@@ -282,9 +328,7 @@
"max": 0
}
}
- }
- ],
- "NovaServers.boot_and_delete_server": [
+ },
{
"args": {
"flavor": {
@@ -352,6 +396,10 @@
"tenants": {{users}},
"users_per_tenant": {{tenants}}
},
+ "api_versions@openstack":
+ {
+ "cinder": {"service_type": "volumev3"}
+ },
"network": {},
"quotas": {
"nova": {
@@ -495,6 +543,10 @@
"tenants": {{users}},
"users_per_tenant": {{tenants}}
},
+ "api_versions@openstack":
+ {
+ "cinder": {"service_type": "volumev3"}
+ },
"network": {},
"quotas": {
"cinder": {
@@ -532,7 +584,11 @@
"snapshots": -1,
"volumes": -1
}
- }
+ },
+ "api_versions@openstack":
+ {
+ "cinder": {"service_type": "volumev3"}
+ }
},
"sla": {
"failure_rate": {
@@ -568,6 +624,10 @@
"snapshots": -1,
"volumes": -1
}
+ },
+ "api_versions@openstack":
+ {
+ "cinder": {"service_type": "volumev3"}
}
},
"sla": {