openstack/rally-openstack
Code Issues Proposed changes

Merge "Fix flavor issues in samples"

Browse Source
This commit is contained in:
Jenkins 2015-05-09 11:32:55 +00:00 committed by Gerrit Code Review
commit b8c914d402
48 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/tasks/scenarios/cinder/create-and-attach-volume.json
View File

@ -7,7 +7,7 @@
"name": "^cirros.*uec$" "name": "^cirros.*uec$"
}, },
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
} }
}, },
"runner": { "runner": {

2
samples/tasks/scenarios/cinder/create-and-attach-volume.yaml
View File

@ -6,7 +6,7 @@
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
runner: runner:
type: "constant" type: "constant"
times: 5 times: 5

2
samples/tasks/scenarios/ec2/boot.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/ec2/boot.yaml
View File

@ -3,7 +3,7 @@
- -
args: args:
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
runner: runner:

2
samples/tasks/scenarios/glance/create-image-and-boot-instances.json
View File

@ -6,7 +6,7 @@
"container_format": "bare", "container_format": "bare",
"disk_format": "qcow2", "disk_format": "qcow2",
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"number_instances": 2 "number_instances": 2
}, },

2
samples/tasks/scenarios/glance/create-image-and-boot-instances.yaml
View File

@ -6,7 +6,7 @@
container_format: "bare" container_format: "bare"
disk_format: "qcow2" disk_format: "qcow2"
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
number_instances: 2 number_instances: 2
runner: runner:
type: "constant" type: "constant"

2
samples/tasks/scenarios/nova/boot-and-block-migrate.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/nova/boot-and-block-migrate.yaml
View File

@ -2,7 +2,7 @@
NovaServers.boot_and_live_migrate_server: NovaServers.boot_and_live_migrate_server:
- args: - args:
flavor: flavor:
name: m1.nano name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
block_migration: true block_migration: true

2
samples/tasks/scenarios/nova/boot-and-delete-server-with-keypairs.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/nova/boot-and-delete-server-with-keypairs.yaml
View File

@ -3,7 +3,7 @@
- -
args: args:
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
runner: runner:

2
samples/tasks/scenarios/nova/boot-and-delete.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/nova/boot-and-delete.yaml
View File

@ -3,7 +3,7 @@
- -
args: args:
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
force_delete: false force_delete: false

2
samples/tasks/scenarios/nova/boot-and-list.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/nova/boot-and-list.yaml
View File

@ -3,7 +3,7 @@
- -
args: args:
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
detailed: True detailed: True

2
samples/tasks/scenarios/nova/boot-and-live-migrate.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/nova/boot-and-live-migrate.yaml
View File

@ -2,7 +2,7 @@
NovaServers.boot_and_live_migrate_server: NovaServers.boot_and_live_migrate_server:
- args: - args:
flavor: flavor:
name: m1.nano name: m1.tiny
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
block_migration: false block_migration: false

2
samples/tasks/scenarios/nova/boot-and-migrate.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/nova/boot-and-migrate.yaml
View File

@ -2,7 +2,7 @@
NovaServers.boot_and_migrate_server: NovaServers.boot_and_migrate_server:
- args: - args:
flavor: flavor:
name: m1.nano name: m1.tiny
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
runner: runner:

4
samples/tasks/scenarios/nova/boot-and-rebuild.json
View File

@ -3,10 +3,10 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"from_image": { "from_image": {
"name": "cirros-0.3.1-x86_64-uec" "name": "cirros-0.3.2-x86_64-uec"
}, },
"to_image": { "to_image": {
"name": "cirros-0.3.2-x86_64-uec" "name": "cirros-0.3.2-x86_64-uec"

4
samples/tasks/scenarios/nova/boot-and-rebuild.yaml
View File

@ -2,9 +2,9 @@
NovaServers.boot_and_rebuild_server: NovaServers.boot_and_rebuild_server:
- args: - args:
flavor: flavor:
name: m1.nano name: "m1.tiny"
from_image: from_image:
name: "cirros-0.3.1-x86_64-uec" name: "cirros-0.3.2-x86_64-uec"
to_image: to_image:
name: "cirros-0.3.2-x86_64-uec" name: "cirros-0.3.2-x86_64-uec"
runner: runner:

2
samples/tasks/scenarios/nova/boot-bounce-delete.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/nova/boot-bounce-delete.yaml
View File

@ -3,7 +3,7 @@
- -
args: args:
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
force_delete: false force_delete: false

2
samples/tasks/scenarios/nova/boot-from-volume-and-delete.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/nova/boot-from-volume-and-delete.yaml
View File

@ -3,7 +3,7 @@
- -
args: args:
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
volume_size: 10 volume_size: 10

2
samples/tasks/scenarios/nova/boot-from-volume.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/nova/boot-from-volume.yaml
View File

@ -3,7 +3,7 @@
- -
args: args:
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
volume_size: 10 volume_size: 10

2
samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-live-migrate.json
View File

@ -8,7 +8,7 @@
"name": "^cirros.*uec$" "name": "^cirros.*uec$"
}, },
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
} }
}, },
"runner": { "runner": {

2
samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-live-migrate.yaml
View File

@ -2,7 +2,7 @@
NovaServers.boot_server_attach_created_volume_and_live_migrate: NovaServers.boot_server_attach_created_volume_and_live_migrate:
- args: - args:
flavor: flavor:
name: m1.nano name: m1.tiny
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
size: 10 size: 10

2
samples/tasks/scenarios/nova/boot-server-from-volume-and-live-migrate.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/nova/boot-server-from-volume-and-live-migrate.yaml
View File

@ -2,7 +2,7 @@
NovaServers.boot_server_from_volume_and_live_migrate: NovaServers.boot_server_from_volume_and_live_migrate:
- args: - args:
flavor: flavor:
name: m1.nano name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
block_migration: false block_migration: false

2
samples/tasks/scenarios/nova/boot-snapshot-boot-delete.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/nova/boot-snapshot-boot-delete.yaml
View File

@ -3,7 +3,7 @@
- -
args: args:
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
force_delete: false force_delete: false

2
samples/tasks/scenarios/nova/boot.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/nova/boot.yaml
View File

@ -3,7 +3,7 @@
- -
args: args:
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
runner: runner:

2
samples/tasks/scenarios/nova/list-servers.json
View File

@ -16,7 +16,7 @@
}, },
"servers": { "servers": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/nova/list-servers.yaml
View File

@ -13,7 +13,7 @@
users_per_tenant: 1 users_per_tenant: 1
servers: servers:
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
servers_per_tenant: 2 servers_per_tenant: 2

2
samples/tasks/scenarios/nova/pause-and-unpause.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/nova/pause-and-unpause.yaml
View File

@ -3,7 +3,7 @@
- -
args: args:
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
force_delete: false force_delete: false

2
samples/tasks/scenarios/nova/resize-server.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/nova/resize-server.yaml
View File

@ -3,7 +3,7 @@
- -
args: args:
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
to_flavor: to_flavor:

2
samples/tasks/scenarios/nova/shelve-and-unshelve.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/nova/shelve-and-unshelve.yaml
View File

@ -3,7 +3,7 @@
- -
args: args:
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
force_delete: false force_delete: false

2
samples/tasks/scenarios/nova/suspend-and-resume.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/nova/suspend-and-resume.yaml
View File

@ -3,7 +3,7 @@
- -
args: args:
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
force_delete: false force_delete: false

2
samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.yaml
View File

@ -3,7 +3,7 @@
- -
args: args:
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
volume_args: volume_args:

2
samples/tasks/scenarios/vm/boot-runcommand-delete.json
View File

@ -3,7 +3,7 @@
{ {
"args": { "args": {
"flavor": { "flavor": {
"name": "m1.nano" "name": "m1.tiny"
}, },
"image": { "image": {
"name": "^cirros.*uec$" "name": "^cirros.*uec$"

2
samples/tasks/scenarios/vm/boot-runcommand-delete.yaml
View File

@ -3,7 +3,7 @@
- -
args: args:
flavor: flavor:
name: "m1.nano" name: "m1.tiny"
image: image:
name: "^cirros.*uec$" name: "^cirros.*uec$"
floating_network: "public" floating_network: "public"