From a73e803e7c5091710ba6eff1c1a8cbfab2ad6f20 Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Mon, 31 Jan 2022 16:48:25 +0100 Subject: [PATCH] Bump default Cirros version Replace heavily outdated Cirros version with a current one. Also, slightly increase RAM allocation in default flavors for newer version to work. Change-Id: Ie80340b3382cd3bed9edb14f9b9aa40eed6ab476 --- etc/rally/rally.conf.sample | 2 +- rally-jobs/certifcation_task_args.yaml | 2 +- rally_openstack/common/cfg/tempest.py | 8 ++--- samples/tasks/contexts/images.json | 2 +- samples/tasks/contexts/images.yaml | 2 +- samples/tasks/contexts/profiles.json | 2 +- samples/tasks/contexts/profiles.yaml | 2 +- .../scenarios/elasticsearch/log-instance.json | 4 +-- .../scenarios/elasticsearch/log-instance.yaml | 2 +- .../glance/create-and-deactivate-image.json | 2 +- .../glance/create-and-deactivate-image.yaml | 2 +- .../glance/create-and-delete-image.json | 2 +- .../glance/create-and-delete-image.yaml | 2 +- .../glance/create-and-download-image.json | 2 +- .../glance/create-and-download-image.yaml | 2 +- .../glance/create-and-get-image.json | 2 +- .../glance/create-and-get-image.yaml | 2 +- .../glance/create-and-list-image.json | 2 +- .../glance/create-and-list-image.yaml | 2 +- .../glance/create-and-update-image.json | 2 +- .../glance/create-and-update-image.yaml | 2 +- .../create-image-and-boot-instances.json | 2 +- .../create-image-and-boot-instances.yaml | 2 +- .../tasks/scenarios/glance/list-images.json | 2 +- .../tasks/scenarios/glance/list-images.yaml | 2 +- .../grafana/push-metric-from-instance.json | 2 +- .../grafana/push-metric-from-instance.yaml | 2 +- .../templates/autoscaling-group.yaml.template | 2 +- ...rce-group-server-with-volume.yaml.template | 2 +- .../templates/server-with-ports.yaml.template | 2 +- .../server-with-volume.yaml.template | 2 +- .../create-and-delete-profile-cluster.json | 2 +- .../create-and-delete-profile-cluster.yaml | 2 +- tasks/openstack/task.yaml | 2 +- tests/unit/task/contexts/nova/test_servers.py | 4 +-- tests/unit/task/test_types.py | 36 +++++++++---------- 36 files changed, 58 insertions(+), 58 deletions(-) diff --git a/etc/rally/rally.conf.sample b/etc/rally/rally.conf.sample index 38b2a8c1..56875092 100644 --- a/etc/rally/rally.conf.sample +++ b/etc/rally/rally.conf.sample @@ -764,7 +764,7 @@ #watcher_audit_launch_timeout = 300 # image URL (string value) -#img_url = http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img +#img_url = http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img # Image disk format to use when creating the image (string value) #img_disk_format = qcow2 diff --git a/rally-jobs/certifcation_task_args.yaml b/rally-jobs/certifcation_task_args.yaml index d77d743e..a9db885e 100644 --- a/rally-jobs/certifcation_task_args.yaml +++ b/rally-jobs/certifcation_task_args.yaml @@ -9,7 +9,7 @@ use_existing_users: false image_name: "^(cirros.*-disk|TestVM)$" flavor_name: "m1.tiny" - glance_image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" + glance_image_location: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img" smoke: true users_amount: 1 tenants_amount: 1 diff --git a/rally_openstack/common/cfg/tempest.py b/rally_openstack/common/cfg/tempest.py index e3d93bae..b2fa2511 100644 --- a/rally_openstack/common/cfg/tempest.py +++ b/rally_openstack/common/cfg/tempest.py @@ -18,7 +18,7 @@ from rally.common import cfg OPTS = {"openstack": [ cfg.StrOpt("img_url", default="http://download.cirros-cloud.net/" - "0.3.5/cirros-0.3.5-x86_64-disk.img", + "0.5.2/cirros-0.5.2-x86_64-disk.img", deprecated_group="tempest", help="image URL"), cfg.StrOpt("img_disk_format", @@ -59,11 +59,11 @@ OPTS = {"openstack": [ deprecated_group="tempest", help="Role for Heat template-defined users"), cfg.IntOpt("flavor_ref_ram", - default="64", + default="128", deprecated_group="tempest", help="Primary flavor RAM size used by most of the test cases"), cfg.IntOpt("flavor_ref_alt_ram", - default="128", + default="192", deprecated_group="tempest", help="Alternate reference flavor RAM size used by test that " "need two flavors, like those that resize an instance"), @@ -77,7 +77,7 @@ OPTS = {"openstack": [ "tests that need two flavors, like those that resize an " "instance"), cfg.IntOpt("heat_instance_type_ram", - default="64", + default="128", deprecated_group="tempest", help="RAM size flavor used for orchestration test cases"), cfg.IntOpt("heat_instance_type_disk", diff --git a/samples/tasks/contexts/images.json b/samples/tasks/contexts/images.json index 7a2ec600..ae506c8d 100644 --- a/samples/tasks/contexts/images.json +++ b/samples/tasks/contexts/images.json @@ -15,7 +15,7 @@ "users_per_tenant": 2 }, "images": { - "image_url": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", + "image_url": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img", "image_type": "qcow2", "image_container": "bare", "images_per_tenant": 4 diff --git a/samples/tasks/contexts/images.yaml b/samples/tasks/contexts/images.yaml index 3bb9cd37..024fe89c 100644 --- a/samples/tasks/contexts/images.yaml +++ b/samples/tasks/contexts/images.yaml @@ -12,7 +12,7 @@ tenants: 1 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" + image_url: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img" image_type: "qcow2" image_container: "bare" images_per_tenant: 4 diff --git a/samples/tasks/contexts/profiles.json b/samples/tasks/contexts/profiles.json index 1db069af..111d4ac1 100644 --- a/samples/tasks/contexts/profiles.json +++ b/samples/tasks/contexts/profiles.json @@ -20,7 +20,7 @@ "properties": { "name": "cirros_server", "flavor": 1, - "image": "cirros-0.3.5-x86_64-disk", + "image": "cirros-0.5.2-x86_64-disk", "networks": [ { "network": "private" } ] diff --git a/samples/tasks/contexts/profiles.yaml b/samples/tasks/contexts/profiles.yaml index 48e951a0..2aad76a4 100644 --- a/samples/tasks/contexts/profiles.yaml +++ b/samples/tasks/contexts/profiles.yaml @@ -17,6 +17,6 @@ properties: name: "cirros_server" flavor: 1 - image: "cirros-0.3.5-x86_64-disk" + image: "cirros-0.5.2-x86_64-disk" networks: - network: "private" diff --git a/samples/tasks/scenarios/elasticsearch/log-instance.json b/samples/tasks/scenarios/elasticsearch/log-instance.json index 4a0353fc..c53d9437 100644 --- a/samples/tasks/scenarios/elasticsearch/log-instance.json +++ b/samples/tasks/scenarios/elasticsearch/log-instance.json @@ -60,7 +60,7 @@ ], "images": { "image_name": "{{ image_name }}", - "image_url": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", + "image_url": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img", "disk_format": "qcow2", "container_format": "bare", "visibility": "public" @@ -73,4 +73,4 @@ } } ] -} \ No newline at end of file +} diff --git a/samples/tasks/scenarios/elasticsearch/log-instance.yaml b/samples/tasks/scenarios/elasticsearch/log-instance.yaml index 5707508d..9f1789c9 100644 --- a/samples/tasks/scenarios/elasticsearch/log-instance.yaml +++ b/samples/tasks/scenarios/elasticsearch/log-instance.yaml @@ -40,7 +40,7 @@ vcpus: 1 images: image_name: {{ image_name }} - image_url: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img + image_url: http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img disk_format: qcow2 container_format: bare visibility: public diff --git a/samples/tasks/scenarios/glance/create-and-deactivate-image.json b/samples/tasks/scenarios/glance/create-and-deactivate-image.json index 2440bd83..818909a7 100644 --- a/samples/tasks/scenarios/glance/create-and-deactivate-image.json +++ b/samples/tasks/scenarios/glance/create-and-deactivate-image.json @@ -2,7 +2,7 @@ "GlanceImages.create_and_deactivate_image": [ { "args": { - "image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", + "image_location": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img", "container_format": "bare", "disk_format": "qcow2" }, diff --git a/samples/tasks/scenarios/glance/create-and-deactivate-image.yaml b/samples/tasks/scenarios/glance/create-and-deactivate-image.yaml index c516a383..5975587c 100644 --- a/samples/tasks/scenarios/glance/create-and-deactivate-image.yaml +++ b/samples/tasks/scenarios/glance/create-and-deactivate-image.yaml @@ -2,7 +2,7 @@ GlanceImages.create_and_deactivate_image: - args: - image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" + image_location: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img" container_format: "bare" disk_format: "qcow2" runner: diff --git a/samples/tasks/scenarios/glance/create-and-delete-image.json b/samples/tasks/scenarios/glance/create-and-delete-image.json index b6f8a4b5..1240c88b 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.5/cirros-0.3.5-x86_64-disk.img", + "image_location": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-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 d3d9a435..efa7257c 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.5/cirros-0.3.5-x86_64-disk.img" + image_location: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img" container_format: "bare" disk_format: "qcow2" runner: diff --git a/samples/tasks/scenarios/glance/create-and-download-image.json b/samples/tasks/scenarios/glance/create-and-download-image.json index 518ef75d..766db538 100644 --- a/samples/tasks/scenarios/glance/create-and-download-image.json +++ b/samples/tasks/scenarios/glance/create-and-download-image.json @@ -2,7 +2,7 @@ "GlanceImages.create_and_download_image": [ { "args": { - "image_location": "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img", + "image_location": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img", "container_format": "bare", "disk_format": "qcow2" }, diff --git a/samples/tasks/scenarios/glance/create-and-download-image.yaml b/samples/tasks/scenarios/glance/create-and-download-image.yaml index 741fc5c6..8c60ad4a 100644 --- a/samples/tasks/scenarios/glance/create-and-download-image.yaml +++ b/samples/tasks/scenarios/glance/create-and-download-image.yaml @@ -2,7 +2,7 @@ GlanceImages.create_and_download_image: - args: - image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" + image_location: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img" container_format: "bare" disk_format: "qcow2" runner: diff --git a/samples/tasks/scenarios/glance/create-and-get-image.json b/samples/tasks/scenarios/glance/create-and-get-image.json index 76d3bcdd..4a9e77a4 100644 --- a/samples/tasks/scenarios/glance/create-and-get-image.json +++ b/samples/tasks/scenarios/glance/create-and-get-image.json @@ -2,7 +2,7 @@ "GlanceImages.create_and_get_image": [ { "args": { - "image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", + "image_location": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img", "container_format": "bare", "disk_format": "qcow2" }, diff --git a/samples/tasks/scenarios/glance/create-and-get-image.yaml b/samples/tasks/scenarios/glance/create-and-get-image.yaml index 6d189db5..dfba2840 100644 --- a/samples/tasks/scenarios/glance/create-and-get-image.yaml +++ b/samples/tasks/scenarios/glance/create-and-get-image.yaml @@ -2,7 +2,7 @@ GlanceImages.create_and_get_image: - args: - image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" + image_location: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-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 406c02ff..d6a81a00 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.5/cirros-0.3.5-x86_64-disk.img", + "image_location": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-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 1b864917..e615cc07 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.5/cirros-0.3.5-x86_64-disk.img" + image_location: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img" container_format: "bare" disk_format: "qcow2" runner: diff --git a/samples/tasks/scenarios/glance/create-and-update-image.json b/samples/tasks/scenarios/glance/create-and-update-image.json index 8f5085f3..75c9e3c2 100644 --- a/samples/tasks/scenarios/glance/create-and-update-image.json +++ b/samples/tasks/scenarios/glance/create-and-update-image.json @@ -2,7 +2,7 @@ "GlanceImages.create_and_update_image": [ { "args": { - "image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", + "image_location": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img", "container_format": "bare", "disk_format": "qcow2" }, diff --git a/samples/tasks/scenarios/glance/create-and-update-image.yaml b/samples/tasks/scenarios/glance/create-and-update-image.yaml index 5f0729e2..8661f142 100644 --- a/samples/tasks/scenarios/glance/create-and-update-image.yaml +++ b/samples/tasks/scenarios/glance/create-and-update-image.yaml @@ -2,7 +2,7 @@ GlanceImages.create_and_update_image: - args: - image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" + image_location: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-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 f176a136..366e53f6 100644 --- a/samples/tasks/scenarios/glance/create-image-and-boot-instances.json +++ b/samples/tasks/scenarios/glance/create-image-and-boot-instances.json @@ -3,7 +3,7 @@ "GlanceImages.create_image_and_boot_instances": [ { "args": { - "image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", + "image_location": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-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 84c14bd9..c65ddac8 100644 --- a/samples/tasks/scenarios/glance/create-image-and-boot-instances.yaml +++ b/samples/tasks/scenarios/glance/create-image-and-boot-instances.yaml @@ -3,7 +3,7 @@ GlanceImages.create_image_and_boot_instances: - args: - image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" + image_location: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img" container_format: "bare" disk_format: "qcow2" flavor: diff --git a/samples/tasks/scenarios/glance/list-images.json b/samples/tasks/scenarios/glance/list-images.json index 86e517eb..aa3ba7d1 100644 --- a/samples/tasks/scenarios/glance/list-images.json +++ b/samples/tasks/scenarios/glance/list-images.json @@ -12,7 +12,7 @@ "users_per_tenant": 2 }, "images": { - "image_url": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", + "image_url": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img", "disk_format": "qcow2", "container_format": "bare", "images_per_tenant": 4 diff --git a/samples/tasks/scenarios/glance/list-images.yaml b/samples/tasks/scenarios/glance/list-images.yaml index 8084a4b9..3bfe8ec5 100644 --- a/samples/tasks/scenarios/glance/list-images.yaml +++ b/samples/tasks/scenarios/glance/list-images.yaml @@ -10,7 +10,7 @@ tenants: 2 users_per_tenant: 2 images: - image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" + image_url: "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img" disk_format: "qcow2" container_format: "bare" images_per_tenant: 4 diff --git a/samples/tasks/scenarios/grafana/push-metric-from-instance.json b/samples/tasks/scenarios/grafana/push-metric-from-instance.json index e7acd8f0..f1666297 100644 --- a/samples/tasks/scenarios/grafana/push-metric-from-instance.json +++ b/samples/tasks/scenarios/grafana/push-metric-from-instance.json @@ -42,7 +42,7 @@ ], "images": { "image_name": "{{ image_name }}", - "image_url": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", + "image_url": "http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img", "disk_format": "qcow2", "container_format": "bare", "visibility": "public" diff --git a/samples/tasks/scenarios/grafana/push-metric-from-instance.yaml b/samples/tasks/scenarios/grafana/push-metric-from-instance.yaml index 010c9865..654314b8 100644 --- a/samples/tasks/scenarios/grafana/push-metric-from-instance.yaml +++ b/samples/tasks/scenarios/grafana/push-metric-from-instance.yaml @@ -34,7 +34,7 @@ vcpus: 1 images: image_name: {{ image_name }} - image_url: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img + image_url: http://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img disk_format: qcow2 container_format: bare visibility: public diff --git a/samples/tasks/scenarios/heat/templates/autoscaling-group.yaml.template b/samples/tasks/scenarios/heat/templates/autoscaling-group.yaml.template index 9ce79960..ab796a65 100644 --- a/samples/tasks/scenarios/heat/templates/autoscaling-group.yaml.template +++ b/samples/tasks/scenarios/heat/templates/autoscaling-group.yaml.template @@ -8,7 +8,7 @@ parameters: - custom_constraint: nova.flavor image: type: string - default: cirros-0.3.5-x86_64-disk + default: cirros-0.5.2-x86_64-disk constraints: - custom_constraint: glance.image scaling_adjustment: diff --git a/samples/tasks/scenarios/heat/templates/resource-group-server-with-volume.yaml.template b/samples/tasks/scenarios/heat/templates/resource-group-server-with-volume.yaml.template index 4a15ca89..4c0be884 100644 --- a/samples/tasks/scenarios/heat/templates/resource-group-server-with-volume.yaml.template +++ b/samples/tasks/scenarios/heat/templates/resource-group-server-with-volume.yaml.template @@ -14,7 +14,7 @@ parameters: - range: {min: 1} instance_image: type: string - default: cirros-0.3.5-x86_64-disk + default: cirros-0.5.2-x86_64-disk instance_volume_size: type: number description: Size of volume to attach to instance diff --git a/samples/tasks/scenarios/heat/templates/server-with-ports.yaml.template b/samples/tasks/scenarios/heat/templates/server-with-ports.yaml.template index 0e344fc0..1bd86918 100644 --- a/samples/tasks/scenarios/heat/templates/server-with-ports.yaml.template +++ b/samples/tasks/scenarios/heat/templates/server-with-ports.yaml.template @@ -7,7 +7,7 @@ parameters: default: public image: type: string - default: cirros-0.3.5-x86_64-disk + default: cirros-0.5.2-x86_64-disk flavor: type: string default: m1.tiny diff --git a/samples/tasks/scenarios/heat/templates/server-with-volume.yaml.template b/samples/tasks/scenarios/heat/templates/server-with-volume.yaml.template index e0bcfe30..ce9017ea 100644 --- a/samples/tasks/scenarios/heat/templates/server-with-volume.yaml.template +++ b/samples/tasks/scenarios/heat/templates/server-with-volume.yaml.template @@ -4,7 +4,7 @@ parameters: # set all correct defaults for parameters before launch test image: type: string - default: cirros-0.3.5-x86_64-disk + default: cirros-0.5.2-x86_64-disk flavor: type: string default: m1.tiny diff --git a/samples/tasks/scenarios/senlin/create-and-delete-profile-cluster.json b/samples/tasks/scenarios/senlin/create-and-delete-profile-cluster.json index 844f106c..3fa5c865 100644 --- a/samples/tasks/scenarios/senlin/create-and-delete-profile-cluster.json +++ b/samples/tasks/scenarios/senlin/create-and-delete-profile-cluster.json @@ -22,7 +22,7 @@ "properties": { "name": "cirros_server", "flavor": 1, - "image": "cirros-0.3.5-x86_64-disk", + "image": "cirros-0.5.2-x86_64-disk", "networks": [ { "network": "private" } ] diff --git a/samples/tasks/scenarios/senlin/create-and-delete-profile-cluster.yaml b/samples/tasks/scenarios/senlin/create-and-delete-profile-cluster.yaml index 701d4e51..3355b21f 100644 --- a/samples/tasks/scenarios/senlin/create-and-delete-profile-cluster.yaml +++ b/samples/tasks/scenarios/senlin/create-and-delete-profile-cluster.yaml @@ -19,7 +19,7 @@ properties: name: cirros_server flavor: 1 - image: "cirros-0.3.5-x86_64-disk" + image: "cirros-0.5.2-x86_64-disk" networks: - network: private sla: diff --git a/tasks/openstack/task.yaml b/tasks/openstack/task.yaml index 5739e31c..1b3b6476 100644 --- a/tasks/openstack/task.yaml +++ b/tasks/openstack/task.yaml @@ -1,4 +1,4 @@ -{%- set glance_image_location = glance_image_location|default("https://download.cirros-cloud.net/0.3.5/cirros-0.3.5-i386-disk.img") %} +{%- set glance_image_location = glance_image_location|default("https://download.cirros-cloud.net/0.5.2/cirros-0.5.2-x86_64-disk.img") %} {%- set image_name = image_name|default("^(cirros.*-disk|TestVM)$") %} {%- set flavor_name = flavor_name|default("m1.tiny") %} {%- set use_existing_users = use_existing_users|default(false) %} diff --git a/tests/unit/task/contexts/nova/test_servers.py b/tests/unit/task/contexts/nova/test_servers.py index 41903546..ce084edd 100755 --- a/tests/unit/task/contexts/nova/test_servers.py +++ b/tests/unit/task/contexts/nova/test_servers.py @@ -84,7 +84,7 @@ class ServerGeneratorTestCase(test.ScenarioTestCase): "auto_assign_nic": True, "servers_per_tenant": 5, "image": { - "name": "cirros-0.3.4-x86_64-uec", + "name": "cirros-0.5.2-x86_64-uec", }, "flavor": { "name": "m1.tiny", @@ -148,7 +148,7 @@ class ServerGeneratorTestCase(test.ScenarioTestCase): "servers": { "servers_per_tenant": 5, "image": { - "name": "cirros-0.3.4-x86_64-uec", + "name": "cirros-0.5.2-x86_64-uec", }, "flavor": { "name": "m1.tiny", diff --git a/tests/unit/task/test_types.py b/tests/unit/task/test_types.py index b2486680..5a7fc160 100644 --- a/tests/unit/task/test_types.py +++ b/tests/unit/task/test_types.py @@ -177,14 +177,14 @@ class GlanceImageTestCase(test.TestCase): def setUp(self): super(GlanceImageTestCase, self).setUp() self.clients = fakes.FakeClients() - image1 = fakes.FakeResource(name="cirros-0.3.4-uec", id="100") + image1 = fakes.FakeResource(name="cirros-0.5.2-uec", id="100") self.clients.glance().images._cache(image1) - image2 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk", id="101") + image2 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk", id="101") self.clients.glance().images._cache(image2) - image3 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy", + image3 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk-copy", id="102") self.clients.glance().images._cache(image3) - image4 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy", + image4 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk-copy", id="103") self.clients.glance().images._cache(image4) self.type_cls = types.GlanceImage( @@ -198,19 +198,19 @@ class GlanceImageTestCase(test.TestCase): self.assertEqual("100", image_id) def test_preprocess_by_name(self): - resource_spec = {"name": "^cirros-0.3.4-uec$"} + resource_spec = {"name": "^cirros-0.5.2-uec$"} image_id = self.type_cls.pre_process( resource_spec=resource_spec, config={}) self.assertEqual("100", image_id) def test_preprocess_by_name_no_match(self): - resource_spec = {"name": "cirros-0.3.4-uec-boot"} + resource_spec = {"name": "cirros-0.5.2-uec-boot"} self.assertRaises(exceptions.InvalidScenarioArgument, self.type_cls.pre_process, resource_spec=resource_spec, config={}) def test_preprocess_by_name_match_multiple(self): - resource_spec = {"name": "cirros-0.3.4-uec-ramdisk-copy"} + resource_spec = {"name": "cirros-0.5.2-uec-ramdisk-copy"} self.assertRaises(exceptions.InvalidScenarioArgument, self.type_cls.pre_process, resource_spec=resource_spec, config={}) @@ -263,23 +263,23 @@ class EC2ImageTestCase(test.TestCase): def setUp(self): super(EC2ImageTestCase, self).setUp() self.clients = fakes.FakeClients() - image1 = fakes.FakeResource(name="cirros-0.3.4-uec", id="100") + image1 = fakes.FakeResource(name="cirros-0.5.2-uec", id="100") self.clients.glance().images._cache(image1) - image2 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk", id="102") + image2 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk", id="102") self.clients.glance().images._cache(image2) - image3 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy", + image3 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk-copy", id="102") self.clients.glance().images._cache(image3) - image4 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy", + image4 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk-copy", id="103") self.clients.glance().images._cache(image4) - ec2_image1 = fakes.FakeResource(name="cirros-0.3.4-uec", id="200") - ec2_image2 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk", + ec2_image1 = fakes.FakeResource(name="cirros-0.5.2-uec", id="200") + ec2_image2 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk", id="201") - ec2_image3 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy", + ec2_image3 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk-copy", id="202") - ec2_image4 = fakes.FakeResource(name="cirros-0.3.4-uec-ramdisk-copy", + ec2_image4 = fakes.FakeResource(name="cirros-0.5.2-uec-ramdisk-copy", id="203") self.clients.ec2().get_all_images = mock.Mock( @@ -290,7 +290,7 @@ class EC2ImageTestCase(test.TestCase): self.type_cls._clients = self.clients def test_preprocess_by_name(self): - resource_spec = {"name": "^cirros-0.3.4-uec$"} + resource_spec = {"name": "^cirros-0.5.2-uec$"} ec2_image_id = self.type_cls.pre_process(resource_spec=resource_spec, config={}) self.assertEqual("200", ec2_image_id) @@ -308,13 +308,13 @@ class EC2ImageTestCase(test.TestCase): resource_spec=resource_spec, config={}) def test_preprocess_by_name_no_match(self): - resource_spec = {"name": "cirros-0.3.4-uec-boot"} + resource_spec = {"name": "cirros-0.5.2-uec-boot"} self.assertRaises(exceptions.InvalidScenarioArgument, self.type_cls.pre_process, resource_spec=resource_spec, config={}) def test_preprocess_by_name_match_multiple(self): - resource_spec = {"name": "cirros-0.3.4-uec-ramdisk-copy"} + resource_spec = {"name": "cirros-0.5.2-uec-ramdisk-copy"} self.assertRaises(exceptions.InvalidScenarioArgument, self.type_cls.pre_process, resource_spec=resource_spec, config={})