openstack/rally-openstack
Code Issues Proposed changes

Merge "Update to latest available CirrOS version 0.3.4"

Browse Source
This commit is contained in:
Jenkins 2015-08-07 00:54:18 +00:00 committed by Gerrit Code Review
commit e7f8ef7bc8
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/rally/rally.conf.sample
View File

@ -606,10 +606,10 @@
# #
# Version of cirros image (string value) # Version of cirros image (string value)
#cirros_version = 0.3.2 #cirros_version = 0.3.4
# Cirros image name (string value) # Cirros image name (string value)
#cirros_image = cirros-0.3.2-x86_64-disk.img #cirros_image = cirros-0.3.4-x86_64-disk.img
# Cirros image base URL (string value) # Cirros image base URL (string value)
#cirros_base_url = http://download.cirros-cloud.net #cirros_base_url = http://download.cirros-cloud.net

4
rally-jobs/rally.yaml
View File

@ -930,7 +930,7 @@
GlanceImages.create_and_delete_image: GlanceImages.create_and_delete_image:
- -
args: args:
image_location: "http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-disk.img" image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
container_format: "bare" container_format: "bare"
disk_format: "qcow2" disk_format: "qcow2"
runner: runner:
@ -966,7 +966,7 @@
GlanceImages.create_image_and_boot_instances: GlanceImages.create_image_and_boot_instances:
- -
args: args:
image_location: "http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-disk.img" image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
container_format: "bare" container_format: "bare"
disk_format: "qcow2" disk_format: "qcow2"
flavor: flavor:

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

@ -2,7 +2,7 @@
"GlanceImages.create_and_delete_image": [ "GlanceImages.create_and_delete_image": [
{ {
"args": { "args": {
"image_location": "http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img", "image_location": "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img",
"container_format": "bare", "container_format": "bare",
"disk_format": "qcow2" "disk_format": "qcow2"
}, },

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

@ -2,7 +2,7 @@
GlanceImages.create_and_delete_image: GlanceImages.create_and_delete_image:
- -
args: args:
image_location: "http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img" image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
container_format: "bare" container_format: "bare"
disk_format: "qcow2" disk_format: "qcow2"
runner: runner:

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

@ -2,7 +2,7 @@
"GlanceImages.create_and_list_image": [ "GlanceImages.create_and_list_image": [
{ {
"args": { "args": {
"image_location": "http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img", "image_location": "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img",
"container_format": "bare", "container_format": "bare",
"disk_format": "qcow2" "disk_format": "qcow2"
}, },

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

@ -2,7 +2,7 @@
GlanceImages.create_and_list_image: GlanceImages.create_and_list_image:
- -
args: args:
image_location: "http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img" image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
container_format: "bare" container_format: "bare"
disk_format: "qcow2" disk_format: "qcow2"
runner: runner:

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

@ -2,7 +2,7 @@
"GlanceImages.create_image_and_boot_instances": [ "GlanceImages.create_image_and_boot_instances": [
{ {
"args": { "args": {
"image_location": "http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img", "image_location": "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img",
"container_format": "bare", "container_format": "bare",
"disk_format": "qcow2", "disk_format": "qcow2",
"flavor": { "flavor": {

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

@ -2,7 +2,7 @@
GlanceImages.create_image_and_boot_instances: GlanceImages.create_image_and_boot_instances:
- -
args: args:
image_location: "http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img" image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
container_format: "bare" container_format: "bare"
disk_format: "qcow2" disk_format: "qcow2"
flavor: flavor:

4
tests/unit/plugins/openstack/context/nova/test_servers.py
View File

@ -87,7 +87,7 @@ class ServerGeneratorTestCase(test.ScenarioTestCase):
"servers": { "servers": {
"servers_per_tenant": 5, "servers_per_tenant": 5,
"image": { "image": {
"name": "cirros-0.3.2-x86_64-uec", "name": "cirros-0.3.4-x86_64-uec",
}, },
"flavor": { "flavor": {
"name": "m1.tiny", "name": "m1.tiny",
@ -140,7 +140,7 @@ class ServerGeneratorTestCase(test.ScenarioTestCase):
"servers": { "servers": {
"servers_per_tenant": 5, "servers_per_tenant": 5,
"image": { "image": {
"name": "cirros-0.3.2-x86_64-uec", "name": "cirros-0.3.4-x86_64-uec",
}, },
"flavor": { "flavor": {
"name": "m1.tiny", "name": "m1.tiny",