diff --git a/rally-jobs/rally-neutron.yaml b/rally-jobs/rally-neutron.yaml index d91d3fbc..035f95b6 100644 --- a/rally-jobs/rally-neutron.yaml +++ b/rally-jobs/rally-neutron.yaml @@ -351,7 +351,7 @@ tenants: 3 users_per_tenant: 2 network: - start_cidr: "100.1.0.0/26" + start_cidr: "10.2.0.0/24" networks_per_tenant: 2 sla: failure_rate: @@ -573,3 +573,23 @@ sla: failure_rate: max: 0 + + VMTasks.boot_runcommand_delete: + - + args: + flavor: + name: "m1.tiny" + image: + name: {{image_name}} + script: "/home/jenkins/.rally/extra/instance_dd_test.sh" + interpreter: "/bin/sh" + username: "cirros" + runner: + type: "constant" + times: 4 + concurrency: 2 + context: + users: + tenants: 3 + users_per_tenant: 2 + network: {} diff --git a/rally-jobs/rally.yaml b/rally-jobs/rally.yaml index b735e579..84a74171 100755 --- a/rally-jobs/rally.yaml +++ b/rally-jobs/rally.yaml @@ -774,7 +774,7 @@ tenants: 3 users_per_tenant: 2 network: - start_cidr: "100.100.0.0/24" + start_cidr: "10.2.0.0/24" networks_per_tenant: 2 - @@ -995,9 +995,7 @@ name: "m1.tiny" image: name: {{image_name}} - fixed_network: "private" floating_network: "public" - use_floatingip: true script: "/home/jenkins/.rally/extra/instance_dd_test.sh" interpreter: "/bin/sh" username: "cirros" @@ -1133,7 +1131,7 @@ tenants: 3 users_per_tenant: 2 network: - start_cidr: "100.1.0.0/26" + start_cidr: "10.2.0.0/24" quotas: nova: security_groups: -1 diff --git a/samples/tasks/scenarios/vm/boot-runcommand-delete.json b/samples/tasks/scenarios/vm/boot-runcommand-delete.json index a2930107..5e3015cd 100644 --- a/samples/tasks/scenarios/vm/boot-runcommand-delete.json +++ b/samples/tasks/scenarios/vm/boot-runcommand-delete.json @@ -8,9 +8,7 @@ "image": { "name": "^cirros.*uec$" }, - "fixed_network": "private", "floating_network": "public", - "use_floatingip": true, "force_delete": false, "script": "doc/samples/tasks/support/instance_dd_test.sh", "interpreter": "/bin/sh", @@ -25,6 +23,8 @@ "users": { "tenants": 3, "users_per_tenant": 2 + }, + "network": { } } } diff --git a/samples/tasks/scenarios/vm/boot-runcommand-delete.yaml b/samples/tasks/scenarios/vm/boot-runcommand-delete.yaml index 8347ce99..fa222705 100644 --- a/samples/tasks/scenarios/vm/boot-runcommand-delete.yaml +++ b/samples/tasks/scenarios/vm/boot-runcommand-delete.yaml @@ -6,9 +6,7 @@ name: "m1.nano" image: name: "^cirros.*uec$" - fixed_network: "private" floating_network: "public" - use_floatingip: true force_delete: false script: "doc/samples/tasks/support/instance_dd_test.sh" interpreter: "/bin/sh" @@ -21,3 +19,4 @@ users: tenants: 3 users_per_tenant: 2 + network: {}