diff --git a/etc/rally/rally.conf.sample b/etc/rally/rally.conf.sample index 6ae44c6d..51d423dc 100644 --- a/etc/rally/rally.conf.sample +++ b/etc/rally/rally.conf.sample @@ -606,10 +606,10 @@ # # Version of cirros image (string value) -#cirros_version = 0.3.2 +#cirros_version = 0.3.4 # 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_base_url = http://download.cirros-cloud.net diff --git a/rally-jobs/rally.yaml b/rally-jobs/rally.yaml index 762a895a..cf14986b 100644 --- a/rally-jobs/rally.yaml +++ b/rally-jobs/rally.yaml @@ -930,7 +930,7 @@ GlanceImages.create_and_delete_image: - 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" disk_format: "qcow2" runner: @@ -966,7 +966,7 @@ GlanceImages.create_image_and_boot_instances: - 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" disk_format: "qcow2" flavor: diff --git a/samples/tasks/scenarios/glance/create-and-delete-image.json b/samples/tasks/scenarios/glance/create-and-delete-image.json index 9f95252f..156e776e 100644 --- a/samples/tasks/scenarios/glance/create-and-delete-image.json +++ b/samples/tasks/scenarios/glance/create-and-delete-image.json @@ -2,7 +2,7 @@ "GlanceImages.create_and_delete_image": [ { "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", "disk_format": "qcow2" }, diff --git a/samples/tasks/scenarios/glance/create-and-delete-image.yaml b/samples/tasks/scenarios/glance/create-and-delete-image.yaml index 78c11029..70d5792e 100644 --- a/samples/tasks/scenarios/glance/create-and-delete-image.yaml +++ b/samples/tasks/scenarios/glance/create-and-delete-image.yaml @@ -2,7 +2,7 @@ GlanceImages.create_and_delete_image: - 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" disk_format: "qcow2" runner: diff --git a/samples/tasks/scenarios/glance/create-and-list-image.json b/samples/tasks/scenarios/glance/create-and-list-image.json index e4919696..b18ff8cb 100644 --- a/samples/tasks/scenarios/glance/create-and-list-image.json +++ b/samples/tasks/scenarios/glance/create-and-list-image.json @@ -2,7 +2,7 @@ "GlanceImages.create_and_list_image": [ { "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", "disk_format": "qcow2" }, diff --git a/samples/tasks/scenarios/glance/create-and-list-image.yaml b/samples/tasks/scenarios/glance/create-and-list-image.yaml index b57cf00c..5edf42d6 100644 --- a/samples/tasks/scenarios/glance/create-and-list-image.yaml +++ b/samples/tasks/scenarios/glance/create-and-list-image.yaml @@ -2,7 +2,7 @@ GlanceImages.create_and_list_image: - 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" disk_format: "qcow2" runner: diff --git a/samples/tasks/scenarios/glance/create-image-and-boot-instances.json b/samples/tasks/scenarios/glance/create-image-and-boot-instances.json index 3399671b..35b55a0e 100644 --- a/samples/tasks/scenarios/glance/create-image-and-boot-instances.json +++ b/samples/tasks/scenarios/glance/create-image-and-boot-instances.json @@ -2,7 +2,7 @@ "GlanceImages.create_image_and_boot_instances": [ { "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", "disk_format": "qcow2", "flavor": { diff --git a/samples/tasks/scenarios/glance/create-image-and-boot-instances.yaml b/samples/tasks/scenarios/glance/create-image-and-boot-instances.yaml index 01afb1c5..a7210293 100644 --- a/samples/tasks/scenarios/glance/create-image-and-boot-instances.yaml +++ b/samples/tasks/scenarios/glance/create-image-and-boot-instances.yaml @@ -2,7 +2,7 @@ GlanceImages.create_image_and_boot_instances: - 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" disk_format: "qcow2" flavor: diff --git a/tests/unit/plugins/openstack/context/nova/test_servers.py b/tests/unit/plugins/openstack/context/nova/test_servers.py index 163ca158..b45da3d3 100644 --- a/tests/unit/plugins/openstack/context/nova/test_servers.py +++ b/tests/unit/plugins/openstack/context/nova/test_servers.py @@ -87,7 +87,7 @@ class ServerGeneratorTestCase(test.ScenarioTestCase): "servers": { "servers_per_tenant": 5, "image": { - "name": "cirros-0.3.2-x86_64-uec", + "name": "cirros-0.3.4-x86_64-uec", }, "flavor": { "name": "m1.tiny", @@ -140,7 +140,7 @@ class ServerGeneratorTestCase(test.ScenarioTestCase): "servers": { "servers_per_tenant": 5, "image": { - "name": "cirros-0.3.2-x86_64-uec", + "name": "cirros-0.3.4-x86_64-uec", }, "flavor": { "name": "m1.tiny",