From 680995e7382855c355967c8fe6dfbce34b1e0fad Mon Sep 17 00:00:00 2001 From: Anton Studenov Date: Thu, 16 Feb 2017 14:29:06 +0300 Subject: [PATCH] [CI] Fix image regexp and version Default image in devstack was changed recently from uec to qcow2. All rally jobs except rally-mos now need to be updated accordingly. devstack changes: * Id65ebae73b28da7185cb349b714b659af51ef77f * I5c154ec25555e768954538fc22b4f5d5975b2deb Change-Id: Ia4d4afb661d8bcc7c38b0a16b508294f789eef14 --- doc/source/quick_start/gates.rst | 2 +- ...env_and_running_benchmark_from_samples.rst | 4 +-- .../tutorial/step_2_input_task_format.rst | 6 ++-- ...tep_3_benchmarking_with_existing_users.rst | 2 +- .../tutorial/step_5_task_templates.rst | 32 +++++++++---------- doc/specs/in-progress/pluggable-types.rst | 2 +- etc/rally/rally.conf.sample | 20 ++++++------ rally-jobs/certifcation_task_args.yaml | 4 +-- rally-jobs/cinder.yaml | 2 +- .../extra/autoscaling_group.yaml.template | 2 +- ...rce_group_server_with_volume.yaml.template | 2 +- .../extra/server_with_ports.yaml.template | 2 +- .../extra/server_with_volume.yaml.template | 2 +- rally-jobs/nova.yaml | 4 +-- rally-jobs/rally-keystone-api-v2.yaml | 2 +- rally-jobs/rally-neutron-existing-users.yaml | 2 +- rally-jobs/rally-neutron.yaml | 2 +- rally-jobs/rally-senlin.yaml | 2 +- rally-jobs/rally.yaml | 2 +- rally-jobs/rally_args.yaml | 2 +- .../plugins/openstack/context/api_versions.py | 4 +-- .../openstack/verification/tempest/config.py | 2 +- .../cinder/create-and-attach-volume.json | 4 +-- .../cinder/create-and-attach-volume.yaml | 4 +-- .../create-and-upload-volume-to-image.json | 4 +-- .../create-and-upload-volume-to-image.yaml | 4 +-- .../create-from-image-and-delete-volume.json | 2 +- .../create-from-image-and-delete-volume.yaml | 2 +- ...te-nested-snapshots-and-attach-volume.json | 2 +- ...te-nested-snapshots-and-attach-volume.yaml | 2 +- .../create-snapshot-and-attach-volume.json | 4 +-- .../create-snapshot-and-attach-volume.yaml | 4 +-- samples/tasks/scenarios/ec2/boot.json | 2 +- samples/tasks/scenarios/ec2/boot.yaml | 2 +- samples/tasks/scenarios/ec2/list-servers.json | 2 +- samples/tasks/scenarios/ec2/list-servers.yaml | 2 +- .../glance/create-and-delete-image.json | 2 +- .../glance/create-and-delete-image.yaml | 2 +- .../glance/create-and-list-image.json | 2 +- .../glance/create-and-list-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 +- .../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 +- .../nova/boot-and-associate-floating-ip.json | 2 +- .../nova/boot-and-associate-floating-ip.yaml | 2 +- .../nova/boot-and-block-migrate.json | 2 +- .../nova/boot-and-block-migrate.yaml | 2 +- .../nova/boot-and-delete-multiple.json | 2 +- .../nova/boot-and-delete-multiple.yaml | 2 +- .../boot-and-delete-server-with-keypairs.json | 2 +- .../boot-and-delete-server-with-keypairs.yaml | 2 +- .../tasks/scenarios/nova/boot-and-delete.json | 4 +-- .../tasks/scenarios/nova/boot-and-delete.yaml | 4 +-- .../nova/boot-and-get-console-server.json | 2 +- .../nova/boot-and-get-console-server.yaml | 2 +- .../tasks/scenarios/nova/boot-and-list.json | 2 +- .../tasks/scenarios/nova/boot-and-list.yaml | 2 +- .../scenarios/nova/boot-and-live-migrate.json | 2 +- .../scenarios/nova/boot-and-live-migrate.yaml | 2 +- .../scenarios/nova/boot-and-migrate.json | 2 +- .../scenarios/nova/boot-and-migrate.yaml | 2 +- .../scenarios/nova/boot-and-rebuild.json | 4 +-- .../scenarios/nova/boot-and-rebuild.yaml | 4 +-- .../scenarios/nova/boot-and-show-server.json | 2 +- .../scenarios/nova/boot-and-show-server.yaml | 2 +- .../nova/boot-and-update-server.json | 2 +- .../nova/boot-and-update-server.yaml | 2 +- .../scenarios/nova/boot-bounce-delete.json | 2 +- .../scenarios/nova/boot-bounce-delete.yaml | 2 +- .../nova/boot-from-volume-and-delete.json | 2 +- .../nova/boot-from-volume-and-delete.yaml | 2 +- .../nova/boot-from-volume-and-resize.json | 2 +- .../nova/boot-from-volume-and-resize.yaml | 2 +- .../nova/boot-from-volume-snapshot.json | 2 +- .../nova/boot-from-volume-snapshot.yaml | 2 +- .../scenarios/nova/boot-from-volume.json | 2 +- .../scenarios/nova/boot-from-volume.yaml | 2 +- .../nova/boot-lock-unlock-and-delete.json | 2 +- .../nova/boot-lock-unlock-and-delete.yaml | 2 +- ...-associate-and-dissociate-floating-ip.json | 2 +- ...-associate-and-dissociate-floating-ip.yaml | 2 +- ...ttach-created-volume-and-live-migrate.json | 2 +- ...ttach-created-volume-and-live-migrate.yaml | 2 +- ...rver-attach-created-volume-and-resize.json | 2 +- ...rver-attach-created-volume-and-resize.yaml | 2 +- ...t-server-from-volume-and-live-migrate.json | 2 +- ...t-server-from-volume-and-live-migrate.yaml | 2 +- .../nova/boot-snapshot-boot-delete.json | 2 +- .../nova/boot-snapshot-boot-delete.yaml | 2 +- samples/tasks/scenarios/nova/boot.json | 2 +- samples/tasks/scenarios/nova/boot.yaml | 2 +- ...te-aggregate-add-host-and-boot-server.json | 2 +- ...te-aggregate-add-host-and-boot-server.yaml | 2 +- .../tasks/scenarios/nova/list-servers.json | 2 +- .../tasks/scenarios/nova/list-servers.yaml | 2 +- .../scenarios/nova/pause-and-unpause.json | 2 +- .../scenarios/nova/pause-and-unpause.yaml | 2 +- .../tasks/scenarios/nova/resize-server.json | 2 +- .../tasks/scenarios/nova/resize-server.yaml | 2 +- .../scenarios/nova/resize-shutoff-server.json | 2 +- .../scenarios/nova/resize-shutoff-server.yaml | 2 +- .../scenarios/nova/shelve-and-unshelve.json | 2 +- .../scenarios/nova/shelve-and-unshelve.yaml | 2 +- .../scenarios/nova/suspend-and-resume.json | 2 +- .../scenarios/nova/suspend-and-resume.yaml | 2 +- .../create-and-delete-profile-cluster.json | 2 +- .../create-and-delete-profile-cluster.yaml | 2 +- .../vm/boot-runcommand-delete-with-disk.json | 2 +- .../vm/boot-runcommand-delete-with-disk.yaml | 2 +- .../scenarios/vm/boot-runcommand-delete.json | 2 +- .../scenarios/vm/boot-runcommand-delete.yaml | 2 +- samples/tasks/scenarios/vm/dd-load-test.json | 2 +- samples/tasks/scenarios/vm/dd-load-test.yaml | 2 +- 118 files changed, 158 insertions(+), 158 deletions(-) diff --git a/doc/source/quick_start/gates.rst b/doc/source/quick_start/gates.rst index 97b77c12..4b856726 100644 --- a/doc/source/quick_start/gates.rst +++ b/doc/source/quick_start/gates.rst @@ -170,7 +170,7 @@ values: --- - image_name: "^cirros.*uec$" + image_name: "^cirros.*-disk$" this file will be automatically used by Rally to substitute the variables in *myscenario.yaml*. diff --git a/doc/source/quick_start/tutorial/step_1_setting_up_env_and_running_benchmark_from_samples.rst b/doc/source/quick_start/tutorial/step_1_setting_up_env_and_running_benchmark_from_samples.rst index 9316a706..d76250a1 100644 --- a/doc/source/quick_start/tutorial/step_1_setting_up_env_and_running_benchmark_from_samples.rst +++ b/doc/source/quick_start/tutorial/step_1_setting_up_env_and_running_benchmark_from_samples.rst @@ -115,7 +115,7 @@ servers (*samples/tasks/scenarios/nova/boot-and-delete.json*): "name": "m1.tiny" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "force_delete": false }, @@ -169,7 +169,7 @@ To start a benchmark task, run the ``task start`` command (you can also add the args values: {u'args': {u'flavor': {u'name': u'm1.tiny'}, u'force_delete': False, - u'image': {u'name': u'^cirros.*uec$'}}, + u'image': {u'name': u'^cirros.*-disk$'}}, u'context': {u'users': {u'project_domain': u'default', u'resource_management_workers': 30, u'tenants': 3, diff --git a/doc/source/quick_start/tutorial/step_2_input_task_format.rst b/doc/source/quick_start/tutorial/step_2_input_task_format.rst index 23139e34..e70ffc77 100644 --- a/doc/source/quick_start/tutorial/step_2_input_task_format.rst +++ b/doc/source/quick_start/tutorial/step_2_input_task_format.rst @@ -71,7 +71,7 @@ JSON file: "name": "m1.tiny" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "force_delete": false }, @@ -168,7 +168,7 @@ you want to run the **boot_and_delete_server** scenario twice: first using the "name": "m1.tiny" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "force_delete": false }, @@ -181,7 +181,7 @@ you want to run the **boot_and_delete_server** scenario twice: first using the "name": "m1.small" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "force_delete": false }, diff --git a/doc/source/quick_start/tutorial/step_3_benchmarking_with_existing_users.rst b/doc/source/quick_start/tutorial/step_3_benchmarking_with_existing_users.rst index ad494e86..12fac707 100644 --- a/doc/source/quick_start/tutorial/step_3_benchmarking_with_existing_users.rst +++ b/doc/source/quick_start/tutorial/step_3_benchmarking_with_existing_users.rst @@ -153,7 +153,7 @@ to use existing users, like in the following configuration file "name": "m1.tiny" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "force_delete": false }, diff --git a/doc/source/quick_start/tutorial/step_5_task_templates.rst b/doc/source/quick_start/tutorial/step_5_task_templates.rst index c04cdba3..36cc4878 100644 --- a/doc/source/quick_start/tutorial/step_5_task_templates.rst +++ b/doc/source/quick_start/tutorial/step_5_task_templates.rst @@ -39,7 +39,7 @@ runs a set of Nova scenarios: flavor: name: "m1.tiny" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" runner: type: "constant" times: 2 @@ -55,7 +55,7 @@ runs a set of Nova scenarios: flavor: name: "m1.tiny" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" to_flavor: name: "m1.small" runner: @@ -67,11 +67,11 @@ runs a set of Nova scenarios: tenants: 1 users_per_tenant: 1 -In both scenarios above, the *"^cirros.*uec$"* image is passed to the scenario -as an argument (so that these scenarios use an appropriate image while booting -servers). Let’s say you want to run the same set of scenarios with the same -runner/context/sla, but you want to try another image while booting server to -compare the performance. The most elegant solution is then to turn the image +In both scenarios above, the *"^cirros.*-disk$"* image is passed to the +scenario as an argument (so that these scenarios use an appropriate image while +booting servers). Let’s say you want to run the same set of scenarios with the +same runner/context/sla, but you want to try another image while booting server +to compare the performance. The most elegant solution is then to turn the image name into a template variable: .. code-block:: yaml @@ -121,8 +121,8 @@ a JSON or YAML dictionary): .. code-block:: bash - rally task start task.yaml --task-args '{"image_name": "^cirros.*uec$"}' - rally task start task.yaml --task-args 'image_name: "^cirros.*uec$"' + rally task start task.yaml --task-args '{"image_name": "^cirros.*-disk$"}' + rally task start task.yaml --task-args 'image_name: "^cirros.*-disk$"' 2. Refer to a file that specifies the argument values (JSON/YAML): @@ -138,7 +138,7 @@ where the files containing argument values should look as follows: .. code-block:: json { - "image_name": "^cirros.*uec$" + "image_name": "^cirros.*-disk$" } *args.yaml*: @@ -146,14 +146,14 @@ where the files containing argument values should look as follows: .. code-block:: yaml --- - image_name: "^cirros.*uec$" + image_name: "^cirros.*-disk$" Passed in either way, these parameter values will be substituted by Rally when starting a task: .. code-block:: console - $ rally task start task.yaml --task-args "image_name: "^cirros.*uec$"" + $ rally task start task.yaml --task-args "image_name: "^cirros.*-disk$"" -------------------------------------------------------------------------------- Preparing input task -------------------------------------------------------------------------------- @@ -167,7 +167,7 @@ starting a task: flavor: name: "m1.tiny" image: - name: ^cirros.*uec$ + name: ^cirros.*-disk$ runner: type: "constant" times: 2 @@ -183,7 +183,7 @@ starting a task: flavor: name: "m1.tiny" image: - name: ^cirros.*uec$ + name: ^cirros.*-disk$ to_flavor: name: "m1.small" runner: @@ -212,7 +212,7 @@ should be set using the *{% set ... %}* clause (*task.yaml*): .. code-block:: yaml - {% set image_name = image_name or "^cirros.*uec$" %} + {% set image_name = image_name or "^cirros.*-disk$" %} --- NovaServers.boot_and_delete_server: @@ -252,7 +252,7 @@ default one will be used: flavor: name: "m1.tiny" image: - name: ^cirros.*uec$ + name: ^cirros.*-disk$ runner: type: "constant" times: 2 diff --git a/doc/specs/in-progress/pluggable-types.rst b/doc/specs/in-progress/pluggable-types.rst index 291edd38..a61dcf02 100644 --- a/doc/specs/in-progress/pluggable-types.rst +++ b/doc/specs/in-progress/pluggable-types.rst @@ -23,7 +23,7 @@ file a user can specify: .. code-block:: yaml image: - regex: cirros-.*-uec + regex: cirros-.*-disk flavor: name: m1.tiny diff --git a/etc/rally/rally.conf.sample b/etc/rally/rally.conf.sample index 619a6551..be8cff47 100644 --- a/etc/rally/rally.conf.sample +++ b/etc/rally/rally.conf.sample @@ -140,6 +140,14 @@ # point value) #cinder_volume_delete_poll_interval = 2.0 +# Time to wait for cinder backup to be restored. (floating point +# value) +#cinder_backup_restore_timeout = 600.0 + +# Interval between checks when waiting for backup restoring. (floating +# point value) +#cinder_backup_restore_poll_interval = 2.0 + # Time to sleep after boot before polling for status (floating point # value) #ec2_server_boot_prepoll_delay = 1.0 @@ -616,7 +624,7 @@ # Deprecated group/name - [DATABASE]/sql_max_retries #max_retries = 10 -# Interval between retries of opening an SQL connection. (integer +# Interval between retries of opening a SQL connection. (integer # value) # Deprecated group/name - [DEFAULT]/sql_retry_interval # Deprecated group/name - [DATABASE]/reconnect_interval @@ -683,15 +691,12 @@ # # image URL (string value) -# Deprecated group/name - [image]/cirros_img_url -#img_url = http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img +#img_url = http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img # Image disk format to use when creating the image (string value) -# Deprecated group/name - [image]/disk_format #img_disk_format = qcow2 # Image container format to use when creating the image (string value) -# Deprecated group/name - [image]/container_format #img_container_format = bare # Regular expression for name of a public image to discover it in the @@ -701,25 +706,20 @@ # this case Rally will create needed resources by itself if the values # for the corresponding config options are not specified in the # Tempest config file (string value) -# Deprecated group/name - [image]/name_regex #img_name_regex = ^.*(cirros|testvm).*$ # Role required for users to be able to create Swift containers # (string value) -# Deprecated group/name - [role]/swift_operator_role #swift_operator_role = Member # User role that has reseller admin (string value) -# Deprecated group/name - [role]/swift_reseller_admin_role #swift_reseller_admin_role = ResellerAdmin # Role required for users to be able to manage Heat stacks (string # value) -# Deprecated group/name - [role]/heat_stack_owner_role #heat_stack_owner_role = heat_stack_owner # Role for Heat template-defined users (string value) -# Deprecated group/name - [role]/heat_stack_user_role #heat_stack_user_role = heat_stack_user # Primary flavor RAM size used by most of the test cases (integer diff --git a/rally-jobs/certifcation_task_args.yaml b/rally-jobs/certifcation_task_args.yaml index 362e1905..d77d743e 100644 --- a/rally-jobs/certifcation_task_args.yaml +++ b/rally-jobs/certifcation_task_args.yaml @@ -7,9 +7,9 @@ - cinder - glance use_existing_users: false - image_name: "^(cirros.*uec|TestVM)$" + image_name: "^(cirros.*-disk|TestVM)$" flavor_name: "m1.tiny" - glance_image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" + glance_image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" smoke: true users_amount: 1 tenants_amount: 1 diff --git a/rally-jobs/cinder.yaml b/rally-jobs/cinder.yaml index ec088b53..494d0e35 100755 --- a/rally-jobs/cinder.yaml +++ b/rally-jobs/cinder.yaml @@ -1,4 +1,4 @@ -{% set image_name = "^(cirros.*uec|TestVM)$" %} +{% set image_name = "^(cirros.*-disk|TestVM)$" %} {% set flavor_name = "m1.tiny" %} --- Authenticate.validate_cinder: diff --git a/rally-jobs/extra/autoscaling_group.yaml.template b/rally-jobs/extra/autoscaling_group.yaml.template index f6f9f124..6c9892b4 100644 --- a/rally-jobs/extra/autoscaling_group.yaml.template +++ b/rally-jobs/extra/autoscaling_group.yaml.template @@ -8,7 +8,7 @@ parameters: - custom_constraint: nova.flavor image: type: string - default: cirros-0.3.4-x86_64-uec + default: cirros-0.3.5-x86_64-disk constraints: - custom_constraint: glance.image scaling_adjustment: diff --git a/rally-jobs/extra/resource_group_server_with_volume.yaml.template b/rally-jobs/extra/resource_group_server_with_volume.yaml.template index 70ce24d0..fbc8842a 100644 --- a/rally-jobs/extra/resource_group_server_with_volume.yaml.template +++ b/rally-jobs/extra/resource_group_server_with_volume.yaml.template @@ -14,7 +14,7 @@ parameters: - range: {min: 1} instance_image: type: string - default: cirros-0.3.4-x86_64-uec + default: cirros-0.3.5-x86_64-disk instance_volume_size: type: number description: Size of volume to attach to instance diff --git a/rally-jobs/extra/server_with_ports.yaml.template b/rally-jobs/extra/server_with_ports.yaml.template index 909f45d2..0e344fc0 100644 --- a/rally-jobs/extra/server_with_ports.yaml.template +++ b/rally-jobs/extra/server_with_ports.yaml.template @@ -7,7 +7,7 @@ parameters: default: public image: type: string - default: cirros-0.3.4-x86_64-uec + default: cirros-0.3.5-x86_64-disk flavor: type: string default: m1.tiny diff --git a/rally-jobs/extra/server_with_volume.yaml.template b/rally-jobs/extra/server_with_volume.yaml.template index 23c88271..6e65cec7 100644 --- a/rally-jobs/extra/server_with_volume.yaml.template +++ b/rally-jobs/extra/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.4-x86_64-uec + default: cirros-0.3.5-x86_64-disk flavor: type: string default: m1.tiny diff --git a/rally-jobs/nova.yaml b/rally-jobs/nova.yaml index 47754731..d26eaf87 100755 --- a/rally-jobs/nova.yaml +++ b/rally-jobs/nova.yaml @@ -1,5 +1,5 @@ -{%- set cirros_image_url = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %} -{% set image_name = "^(cirros.*uec|TestVM)$" %} +{%- set cirros_image_url = "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" %} +{% set image_name = "^(cirros.*-disk|TestVM)$" %} {% set flavor_name = "m1.tiny" %} {% set volume_type = "" %} --- diff --git a/rally-jobs/rally-keystone-api-v2.yaml b/rally-jobs/rally-keystone-api-v2.yaml index 3279f28f..808a72fe 100644 --- a/rally-jobs/rally-keystone-api-v2.yaml +++ b/rally-jobs/rally-keystone-api-v2.yaml @@ -1,4 +1,4 @@ -{%- set cirros_image_url = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %} +{%- set cirros_image_url = "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" %} --- KeystoneBasic.create_user: - diff --git a/rally-jobs/rally-neutron-existing-users.yaml b/rally-jobs/rally-neutron-existing-users.yaml index 68e98416..f3ab4f95 100644 --- a/rally-jobs/rally-neutron-existing-users.yaml +++ b/rally-jobs/rally-neutron-existing-users.yaml @@ -1,4 +1,4 @@ -{% set image_name = "^cirros.*uec$" %} +{% set image_name = "^cirros.*-disk$" %} {% set smoke = 0 %} --- diff --git a/rally-jobs/rally-neutron.yaml b/rally-jobs/rally-neutron.yaml index 178e1780..430bc81f 100644 --- a/rally-jobs/rally-neutron.yaml +++ b/rally-jobs/rally-neutron.yaml @@ -1,4 +1,4 @@ -{% set image_name = "^cirros.*uec$" %} +{% set image_name = "^cirros.*-disk$" %} {% set flavor_name = "m1.tiny" %} {% set smoke = 0 %} diff --git a/rally-jobs/rally-senlin.yaml b/rally-jobs/rally-senlin.yaml index f2a875d8..e63fde27 100644 --- a/rally-jobs/rally-senlin.yaml +++ b/rally-jobs/rally-senlin.yaml @@ -19,7 +19,7 @@ properties: name: cirros_server flavor: 1 - image: "cirros-0.3.4-x86_64-uec" + image: "cirros-0.3.5-x86_64-disk.img" networks: - network: private sla: diff --git a/rally-jobs/rally.yaml b/rally-jobs/rally.yaml index c794dd3f..70ee3732 100644 --- a/rally-jobs/rally.yaml +++ b/rally-jobs/rally.yaml @@ -1,4 +1,4 @@ -{%- set cirros_image_url = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %} +{%- set cirros_image_url = "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" %} --- KeystoneBasic.create_user: - diff --git a/rally-jobs/rally_args.yaml b/rally-jobs/rally_args.yaml index dd4bdf35..51391b31 100644 --- a/rally-jobs/rally_args.yaml +++ b/rally-jobs/rally_args.yaml @@ -1,3 +1,3 @@ --- - image_name: "^cirros.*uec$" + image_name: "^cirros.*-disk$" diff --git a/rally/plugins/openstack/context/api_versions.py b/rally/plugins/openstack/context/api_versions.py index df545301..5cfc5f30 100644 --- a/rally/plugins/openstack/context/api_versions.py +++ b/rally/plugins/openstack/context/api_versions.py @@ -82,7 +82,7 @@ class OpenStackAPIVersions(context.Context): "args": { "size": 10, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "flavor": { "name": "m1.tiny" @@ -126,7 +126,7 @@ class OpenStackAPIVersions(context.Context): "args": { "size": 10, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "flavor": { "name": "m1.tiny" diff --git a/rally/plugins/openstack/verification/tempest/config.py b/rally/plugins/openstack/verification/tempest/config.py index 472b45b9..762d68d1 100644 --- a/rally/plugins/openstack/verification/tempest/config.py +++ b/rally/plugins/openstack/verification/tempest/config.py @@ -29,7 +29,7 @@ from rally.verification import utils TEMPEST_OPTS = [ cfg.StrOpt("img_url", default="http://download.cirros-cloud.net/" - "0.3.4/cirros-0.3.4-x86_64-disk.img", + "0.3.5/cirros-0.3.5-x86_64-disk.img", help="image URL"), cfg.StrOpt("img_disk_format", default="qcow2", diff --git a/samples/tasks/scenarios/cinder/create-and-attach-volume.json b/samples/tasks/scenarios/cinder/create-and-attach-volume.json index c3a2ff5f..0d255db0 100644 --- a/samples/tasks/scenarios/cinder/create-and-attach-volume.json +++ b/samples/tasks/scenarios/cinder/create-and-attach-volume.json @@ -6,7 +6,7 @@ "args": { "size": 10, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "flavor": { "name": "{{flavor_name}}" @@ -37,7 +37,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "create_volume_params": { "availability_zone": "{{availability_zone}}" diff --git a/samples/tasks/scenarios/cinder/create-and-attach-volume.yaml b/samples/tasks/scenarios/cinder/create-and-attach-volume.yaml index 0fd4ab67..1ffe3b4f 100644 --- a/samples/tasks/scenarios/cinder/create-and-attach-volume.yaml +++ b/samples/tasks/scenarios/cinder/create-and-attach-volume.yaml @@ -6,7 +6,7 @@ args: size: 10 image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" flavor: name: "{{flavor_name}}" create_volume_params: @@ -27,7 +27,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" create_volume_params: availability_zone: "{{availability_zone}}" runner: diff --git a/samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.json b/samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.json index 76747619..ec97b9ad 100644 --- a/samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.json +++ b/samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.json @@ -8,7 +8,7 @@ "disk_format": "raw", "do_delete": true, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" } }, "runner": { @@ -34,7 +34,7 @@ "disk_format": "raw", "do_delete": true, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" } }, "runner": { diff --git a/samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.yaml b/samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.yaml index de73b2b0..70078783 100644 --- a/samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.yaml +++ b/samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.yaml @@ -8,7 +8,7 @@ disk_format: "raw" do_delete: true image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" runner: type: "constant" times: 3 @@ -27,7 +27,7 @@ disk_format: "raw" do_delete: true image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" runner: type: "constant" times: 3 diff --git a/samples/tasks/scenarios/cinder/create-from-image-and-delete-volume.json b/samples/tasks/scenarios/cinder/create-from-image-and-delete-volume.json index 25f6081b..cae094ba 100644 --- a/samples/tasks/scenarios/cinder/create-from-image-and-delete-volume.json +++ b/samples/tasks/scenarios/cinder/create-from-image-and-delete-volume.json @@ -4,7 +4,7 @@ "args": { "size": 1, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" } }, "runner": { diff --git a/samples/tasks/scenarios/cinder/create-from-image-and-delete-volume.yaml b/samples/tasks/scenarios/cinder/create-from-image-and-delete-volume.yaml index 7458ebfc..c1cd9582 100644 --- a/samples/tasks/scenarios/cinder/create-from-image-and-delete-volume.yaml +++ b/samples/tasks/scenarios/cinder/create-from-image-and-delete-volume.yaml @@ -4,7 +4,7 @@ args: size: 1 image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" runner: type: "constant" times: 2 diff --git a/samples/tasks/scenarios/cinder/create-nested-snapshots-and-attach-volume.json b/samples/tasks/scenarios/cinder/create-nested-snapshots-and-attach-volume.json index faf5a2be..fa238f13 100644 --- a/samples/tasks/scenarios/cinder/create-nested-snapshots-and-attach-volume.json +++ b/samples/tasks/scenarios/cinder/create-nested-snapshots-and-attach-volume.json @@ -21,7 +21,7 @@ }, "servers": { "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "flavor": { "name": "{{flavor_name}}" diff --git a/samples/tasks/scenarios/cinder/create-nested-snapshots-and-attach-volume.yaml b/samples/tasks/scenarios/cinder/create-nested-snapshots-and-attach-volume.yaml index bb2184ef..bb4a5395 100644 --- a/samples/tasks/scenarios/cinder/create-nested-snapshots-and-attach-volume.yaml +++ b/samples/tasks/scenarios/cinder/create-nested-snapshots-and-attach-volume.yaml @@ -17,7 +17,7 @@ users_per_tenant: 1 servers: image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" flavor: name: "{{flavor_name}}" servers_per_tenant: 2 diff --git a/samples/tasks/scenarios/cinder/create-snapshot-and-attach-volume.json b/samples/tasks/scenarios/cinder/create-snapshot-and-attach-volume.json index 5530fe2b..4d8fc1cd 100644 --- a/samples/tasks/scenarios/cinder/create-snapshot-and-attach-volume.json +++ b/samples/tasks/scenarios/cinder/create-snapshot-and-attach-volume.json @@ -21,7 +21,7 @@ }, "servers": { "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "flavor": { "name": "{{flavor_name}}" @@ -50,7 +50,7 @@ }, "servers": { "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "flavor": { "name": "{{flavor_name}}" diff --git a/samples/tasks/scenarios/cinder/create-snapshot-and-attach-volume.yaml b/samples/tasks/scenarios/cinder/create-snapshot-and-attach-volume.yaml index a2a397aa..b9431ed5 100644 --- a/samples/tasks/scenarios/cinder/create-snapshot-and-attach-volume.yaml +++ b/samples/tasks/scenarios/cinder/create-snapshot-and-attach-volume.yaml @@ -17,7 +17,7 @@ users_per_tenant: 1 servers: image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" flavor: name: "{{flavor_name}}" servers_per_tenant: 2 @@ -37,7 +37,7 @@ users_per_tenant: 1 servers: image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" flavor: name: "{{flavor_name}}" servers_per_tenant: 2 diff --git a/samples/tasks/scenarios/ec2/boot.json b/samples/tasks/scenarios/ec2/boot.json index 2e0b33dc..ad418761 100644 --- a/samples/tasks/scenarios/ec2/boot.json +++ b/samples/tasks/scenarios/ec2/boot.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" } }, "runner": { diff --git a/samples/tasks/scenarios/ec2/boot.yaml b/samples/tasks/scenarios/ec2/boot.yaml index 3f968fe8..1bc23344 100644 --- a/samples/tasks/scenarios/ec2/boot.yaml +++ b/samples/tasks/scenarios/ec2/boot.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" runner: type: "constant" times: 10 diff --git a/samples/tasks/scenarios/ec2/list-servers.json b/samples/tasks/scenarios/ec2/list-servers.json index ef36bc60..3b2cfae6 100644 --- a/samples/tasks/scenarios/ec2/list-servers.json +++ b/samples/tasks/scenarios/ec2/list-servers.json @@ -16,7 +16,7 @@ "name": "m1.tiny" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "servers_per_tenant": 2 } diff --git a/samples/tasks/scenarios/ec2/list-servers.yaml b/samples/tasks/scenarios/ec2/list-servers.yaml index 5befad2e..98e74171 100644 --- a/samples/tasks/scenarios/ec2/list-servers.yaml +++ b/samples/tasks/scenarios/ec2/list-servers.yaml @@ -13,5 +13,5 @@ flavor: name: "m1.tiny" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" servers_per_tenant: 2 diff --git a/samples/tasks/scenarios/glance/create-and-delete-image.json b/samples/tasks/scenarios/glance/create-and-delete-image.json index 156e776e..4bead2b7 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.4/cirros-0.3.4-x86_64-disk.img", + "image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-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 70d5792e..8feb9735 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.4/cirros-0.3.4-x86_64-disk.img" + image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-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 b18ff8cb..57049840 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.4/cirros-0.3.4-x86_64-disk.img", + "image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-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 5edf42d6..df334e2f 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.4/cirros-0.3.4-x86_64-disk.img" + image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-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 31915798..e7417f08 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.4/cirros-0.3.4-x86_64-disk.img", + "image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-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 17c84ae1..8a677e92 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.4/cirros-0.3.4-x86_64-disk.img" + image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-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 934c1aa3..86c7b817 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.4/cirros-0.3.4-x86_64-disk.img", + "image_url": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img", "image_type": "qcow2", "image_container": "bare", "images_per_tenant": 4 diff --git a/samples/tasks/scenarios/glance/list-images.yaml b/samples/tasks/scenarios/glance/list-images.yaml index 5bc039d4..1d5545b4 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.4/cirros-0.3.4-x86_64-disk.img" + image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img" image_type: "qcow2" image_container: "bare" images_per_tenant: 4 diff --git a/samples/tasks/scenarios/heat/templates/autoscaling-group.yaml.template b/samples/tasks/scenarios/heat/templates/autoscaling-group.yaml.template index f6f9f124..6c9892b4 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.4-x86_64-uec + default: cirros-0.3.5-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 60905683..4a15ca89 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.4-x86_64-uec + default: cirros-0.3.5-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 909f45d2..0e344fc0 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.4-x86_64-uec + default: cirros-0.3.5-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 23c88271..6e65cec7 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.4-x86_64-uec + default: cirros-0.3.5-x86_64-disk flavor: type: string default: m1.tiny diff --git a/samples/tasks/scenarios/nova/boot-and-associate-floating-ip.json b/samples/tasks/scenarios/nova/boot-and-associate-floating-ip.json index fc60733c..87c0d66e 100644 --- a/samples/tasks/scenarios/nova/boot-and-associate-floating-ip.json +++ b/samples/tasks/scenarios/nova/boot-and-associate-floating-ip.json @@ -12,7 +12,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" } }, "context": { diff --git a/samples/tasks/scenarios/nova/boot-and-associate-floating-ip.yaml b/samples/tasks/scenarios/nova/boot-and-associate-floating-ip.yaml index 61c7b3c9..47f6ef4a 100644 --- a/samples/tasks/scenarios/nova/boot-and-associate-floating-ip.yaml +++ b/samples/tasks/scenarios/nova/boot-and-associate-floating-ip.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" runner: type: "constant" times: 1 diff --git a/samples/tasks/scenarios/nova/boot-and-block-migrate.json b/samples/tasks/scenarios/nova/boot-and-block-migrate.json index 711698f6..82ba229c 100644 --- a/samples/tasks/scenarios/nova/boot-and-block-migrate.json +++ b/samples/tasks/scenarios/nova/boot-and-block-migrate.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "block_migration": true }, diff --git a/samples/tasks/scenarios/nova/boot-and-block-migrate.yaml b/samples/tasks/scenarios/nova/boot-and-block-migrate.yaml index 0b43f4e2..a46a9b07 100644 --- a/samples/tasks/scenarios/nova/boot-and-block-migrate.yaml +++ b/samples/tasks/scenarios/nova/boot-and-block-migrate.yaml @@ -5,7 +5,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" block_migration: true runner: type: "constant" diff --git a/samples/tasks/scenarios/nova/boot-and-delete-multiple.json b/samples/tasks/scenarios/nova/boot-and-delete-multiple.json index e80a3bf2..bf086d49 100644 --- a/samples/tasks/scenarios/nova/boot-and-delete-multiple.json +++ b/samples/tasks/scenarios/nova/boot-and-delete-multiple.json @@ -10,7 +10,7 @@ "args": { "count": 5, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "flavor": { "name": "{{flavor_name}}" diff --git a/samples/tasks/scenarios/nova/boot-and-delete-multiple.yaml b/samples/tasks/scenarios/nova/boot-and-delete-multiple.yaml index db935e6c..9662ccda 100644 --- a/samples/tasks/scenarios/nova/boot-and-delete-multiple.yaml +++ b/samples/tasks/scenarios/nova/boot-and-delete-multiple.yaml @@ -4,7 +4,7 @@ - args: image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" flavor: name: "{{flavor_name}}" count: 5 diff --git a/samples/tasks/scenarios/nova/boot-and-delete-server-with-keypairs.json b/samples/tasks/scenarios/nova/boot-and-delete-server-with-keypairs.json index b6e9dc9b..b8b75e33 100644 --- a/samples/tasks/scenarios/nova/boot-and-delete-server-with-keypairs.json +++ b/samples/tasks/scenarios/nova/boot-and-delete-server-with-keypairs.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "boot_server_kwargs": {} }, diff --git a/samples/tasks/scenarios/nova/boot-and-delete-server-with-keypairs.yaml b/samples/tasks/scenarios/nova/boot-and-delete-server-with-keypairs.yaml index f28be813..bed258e9 100644 --- a/samples/tasks/scenarios/nova/boot-and-delete-server-with-keypairs.yaml +++ b/samples/tasks/scenarios/nova/boot-and-delete-server-with-keypairs.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" boot_server_kwargs: {} runner: type: "constant" diff --git a/samples/tasks/scenarios/nova/boot-and-delete.json b/samples/tasks/scenarios/nova/boot-and-delete.json index 9170e7de..ceb3cccc 100644 --- a/samples/tasks/scenarios/nova/boot-and-delete.json +++ b/samples/tasks/scenarios/nova/boot-and-delete.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "force_delete": false }, @@ -29,7 +29,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "auto_assign_nic": true }, diff --git a/samples/tasks/scenarios/nova/boot-and-delete.yaml b/samples/tasks/scenarios/nova/boot-and-delete.yaml index f9130de6..0b201876 100644 --- a/samples/tasks/scenarios/nova/boot-and-delete.yaml +++ b/samples/tasks/scenarios/nova/boot-and-delete.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" force_delete: false runner: type: "constant" @@ -22,7 +22,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" auto_assign_nic: true runner: type: "constant" diff --git a/samples/tasks/scenarios/nova/boot-and-get-console-server.json b/samples/tasks/scenarios/nova/boot-and-get-console-server.json index f7fa9915..92c76c0f 100644 --- a/samples/tasks/scenarios/nova/boot-and-get-console-server.json +++ b/samples/tasks/scenarios/nova/boot-and-get-console-server.json @@ -1,5 +1,5 @@ {% set flavor_name = flavor_name or "m1.tiny" %} -{% set image_name = image_name or "^cirros.*uec$" %} +{% set image_name = image_name or "^cirros.*-disk$" %} { "NovaServers.boot_and_get_console_output": [ { diff --git a/samples/tasks/scenarios/nova/boot-and-get-console-server.yaml b/samples/tasks/scenarios/nova/boot-and-get-console-server.yaml index 251a5844..01b81749 100644 --- a/samples/tasks/scenarios/nova/boot-and-get-console-server.yaml +++ b/samples/tasks/scenarios/nova/boot-and-get-console-server.yaml @@ -1,5 +1,5 @@ {% set flavor_name = flavor_name or "m1.tiny" %} -{% set image_name = image_name or "^cirros.*uec$" %} +{% set image_name = image_name or "^cirros.*-disk$" %} --- NovaServers.boot_and_get_console_output: - diff --git a/samples/tasks/scenarios/nova/boot-and-list.json b/samples/tasks/scenarios/nova/boot-and-list.json index 7978bbfd..f633c4a0 100644 --- a/samples/tasks/scenarios/nova/boot-and-list.json +++ b/samples/tasks/scenarios/nova/boot-and-list.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "detailed": true }, diff --git a/samples/tasks/scenarios/nova/boot-and-list.yaml b/samples/tasks/scenarios/nova/boot-and-list.yaml index 31aa0ecb..90d8694c 100644 --- a/samples/tasks/scenarios/nova/boot-and-list.yaml +++ b/samples/tasks/scenarios/nova/boot-and-list.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" detailed: True runner: type: "constant" diff --git a/samples/tasks/scenarios/nova/boot-and-live-migrate.json b/samples/tasks/scenarios/nova/boot-and-live-migrate.json index 384ef13b..f93131db 100644 --- a/samples/tasks/scenarios/nova/boot-and-live-migrate.json +++ b/samples/tasks/scenarios/nova/boot-and-live-migrate.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "block_migration": false }, diff --git a/samples/tasks/scenarios/nova/boot-and-live-migrate.yaml b/samples/tasks/scenarios/nova/boot-and-live-migrate.yaml index a8953c2a..92b84053 100644 --- a/samples/tasks/scenarios/nova/boot-and-live-migrate.yaml +++ b/samples/tasks/scenarios/nova/boot-and-live-migrate.yaml @@ -5,7 +5,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" block_migration: false runner: type: "constant" diff --git a/samples/tasks/scenarios/nova/boot-and-migrate.json b/samples/tasks/scenarios/nova/boot-and-migrate.json index 96264ab7..64b53cdf 100644 --- a/samples/tasks/scenarios/nova/boot-and-migrate.json +++ b/samples/tasks/scenarios/nova/boot-and-migrate.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" } }, "runner": { diff --git a/samples/tasks/scenarios/nova/boot-and-migrate.yaml b/samples/tasks/scenarios/nova/boot-and-migrate.yaml index 360fbabf..e15d32c9 100644 --- a/samples/tasks/scenarios/nova/boot-and-migrate.yaml +++ b/samples/tasks/scenarios/nova/boot-and-migrate.yaml @@ -5,7 +5,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" runner: type: "constant" times: 10 diff --git a/samples/tasks/scenarios/nova/boot-and-rebuild.json b/samples/tasks/scenarios/nova/boot-and-rebuild.json index ecee1316..98a5e8ef 100644 --- a/samples/tasks/scenarios/nova/boot-and-rebuild.json +++ b/samples/tasks/scenarios/nova/boot-and-rebuild.json @@ -7,10 +7,10 @@ "name": "{{flavor_name}}" }, "from_image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "to_image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" } }, "runner": { diff --git a/samples/tasks/scenarios/nova/boot-and-rebuild.yaml b/samples/tasks/scenarios/nova/boot-and-rebuild.yaml index 7a68417b..e540dfe5 100644 --- a/samples/tasks/scenarios/nova/boot-and-rebuild.yaml +++ b/samples/tasks/scenarios/nova/boot-and-rebuild.yaml @@ -5,9 +5,9 @@ flavor: name: "{{flavor_name}}" from_image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" to_image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" runner: type: "constant" times: 5 diff --git a/samples/tasks/scenarios/nova/boot-and-show-server.json b/samples/tasks/scenarios/nova/boot-and-show-server.json index d837b158..17b6ff28 100644 --- a/samples/tasks/scenarios/nova/boot-and-show-server.json +++ b/samples/tasks/scenarios/nova/boot-and-show-server.json @@ -1,5 +1,5 @@ {% set flavor_name = flavor_name or "m1.tiny" %} -{% set image_name = image_name or "^cirros.*uec$" %} +{% set image_name = image_name or "^cirros.*-disk$" %} { "NovaServers.boot_and_show_server": [ { diff --git a/samples/tasks/scenarios/nova/boot-and-show-server.yaml b/samples/tasks/scenarios/nova/boot-and-show-server.yaml index b76abd2b..0328df6b 100644 --- a/samples/tasks/scenarios/nova/boot-and-show-server.yaml +++ b/samples/tasks/scenarios/nova/boot-and-show-server.yaml @@ -1,5 +1,5 @@ {% set flavor_name = flavor_name or "m1.tiny" %} -{% set image_name = image_name or "^cirros.*uec$" %} +{% set image_name = image_name or "^cirros.*-disk$" %} --- NovaServers.boot_and_show_server: - diff --git a/samples/tasks/scenarios/nova/boot-and-update-server.json b/samples/tasks/scenarios/nova/boot-and-update-server.json index 1c7727d6..caba47ff 100644 --- a/samples/tasks/scenarios/nova/boot-and-update-server.json +++ b/samples/tasks/scenarios/nova/boot-and-update-server.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" } }, "runner": { diff --git a/samples/tasks/scenarios/nova/boot-and-update-server.yaml b/samples/tasks/scenarios/nova/boot-and-update-server.yaml index 6692e6de..ab560856 100644 --- a/samples/tasks/scenarios/nova/boot-and-update-server.yaml +++ b/samples/tasks/scenarios/nova/boot-and-update-server.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" runner: type: "constant" times: 10 diff --git a/samples/tasks/scenarios/nova/boot-bounce-delete.json b/samples/tasks/scenarios/nova/boot-bounce-delete.json index 4b5f5875..8491447c 100644 --- a/samples/tasks/scenarios/nova/boot-bounce-delete.json +++ b/samples/tasks/scenarios/nova/boot-bounce-delete.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "force_delete": false, "actions": [ diff --git a/samples/tasks/scenarios/nova/boot-bounce-delete.yaml b/samples/tasks/scenarios/nova/boot-bounce-delete.yaml index ca297dda..da211aa9 100644 --- a/samples/tasks/scenarios/nova/boot-bounce-delete.yaml +++ b/samples/tasks/scenarios/nova/boot-bounce-delete.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" force_delete: false actions: - diff --git a/samples/tasks/scenarios/nova/boot-from-volume-and-delete.json b/samples/tasks/scenarios/nova/boot-from-volume-and-delete.json index 5b6c5dc9..2aa71e12 100755 --- a/samples/tasks/scenarios/nova/boot-from-volume-and-delete.json +++ b/samples/tasks/scenarios/nova/boot-from-volume-and-delete.json @@ -8,7 +8,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "volume_size": 10, "volume_type": "{{volume_type}}", diff --git a/samples/tasks/scenarios/nova/boot-from-volume-and-delete.yaml b/samples/tasks/scenarios/nova/boot-from-volume-and-delete.yaml index 93a83d78..8e555550 100755 --- a/samples/tasks/scenarios/nova/boot-from-volume-and-delete.yaml +++ b/samples/tasks/scenarios/nova/boot-from-volume-and-delete.yaml @@ -7,7 +7,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" volume_size: 10 volume_type: "{{volume_type}}" force_delete: false diff --git a/samples/tasks/scenarios/nova/boot-from-volume-and-resize.json b/samples/tasks/scenarios/nova/boot-from-volume-and-resize.json index 1d138ad8..870dc092 100644 --- a/samples/tasks/scenarios/nova/boot-from-volume-and-resize.json +++ b/samples/tasks/scenarios/nova/boot-from-volume-and-resize.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "to_flavor": { "name": "m1.small" diff --git a/samples/tasks/scenarios/nova/boot-from-volume-and-resize.yaml b/samples/tasks/scenarios/nova/boot-from-volume-and-resize.yaml index 59373de2..a65e60d3 100644 --- a/samples/tasks/scenarios/nova/boot-from-volume-and-resize.yaml +++ b/samples/tasks/scenarios/nova/boot-from-volume-and-resize.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" to_flavor: name: "m1.small" confirm: true diff --git a/samples/tasks/scenarios/nova/boot-from-volume-snapshot.json b/samples/tasks/scenarios/nova/boot-from-volume-snapshot.json index da72e009..785003f3 100755 --- a/samples/tasks/scenarios/nova/boot-from-volume-snapshot.json +++ b/samples/tasks/scenarios/nova/boot-from-volume-snapshot.json @@ -8,7 +8,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "volume_size": 10, "volume_type": "{{volume_type}}" diff --git a/samples/tasks/scenarios/nova/boot-from-volume-snapshot.yaml b/samples/tasks/scenarios/nova/boot-from-volume-snapshot.yaml index 85cd2d5a..818cfe80 100755 --- a/samples/tasks/scenarios/nova/boot-from-volume-snapshot.yaml +++ b/samples/tasks/scenarios/nova/boot-from-volume-snapshot.yaml @@ -7,7 +7,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" volume_size: 10 volume_type: "{{volume_type}}" runner: diff --git a/samples/tasks/scenarios/nova/boot-from-volume.json b/samples/tasks/scenarios/nova/boot-from-volume.json index 5462eba9..86418e3e 100755 --- a/samples/tasks/scenarios/nova/boot-from-volume.json +++ b/samples/tasks/scenarios/nova/boot-from-volume.json @@ -8,7 +8,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "volume_size": 10, "volume_type": "{{volume_type}}" diff --git a/samples/tasks/scenarios/nova/boot-from-volume.yaml b/samples/tasks/scenarios/nova/boot-from-volume.yaml index 3d2790a2..ae0e96be 100755 --- a/samples/tasks/scenarios/nova/boot-from-volume.yaml +++ b/samples/tasks/scenarios/nova/boot-from-volume.yaml @@ -7,7 +7,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" volume_size: 10 volume_type: "{{volume_type}}" runner: diff --git a/samples/tasks/scenarios/nova/boot-lock-unlock-and-delete.json b/samples/tasks/scenarios/nova/boot-lock-unlock-and-delete.json index 3fd419ea..ab82e173 100644 --- a/samples/tasks/scenarios/nova/boot-lock-unlock-and-delete.json +++ b/samples/tasks/scenarios/nova/boot-lock-unlock-and-delete.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" } }, "runner": { diff --git a/samples/tasks/scenarios/nova/boot-lock-unlock-and-delete.yaml b/samples/tasks/scenarios/nova/boot-lock-unlock-and-delete.yaml index 5dd98237..da76049f 100644 --- a/samples/tasks/scenarios/nova/boot-lock-unlock-and-delete.yaml +++ b/samples/tasks/scenarios/nova/boot-lock-unlock-and-delete.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" runner: type: "constant" times: 10 diff --git a/samples/tasks/scenarios/nova/boot-server-associate-and-dissociate-floating-ip.json b/samples/tasks/scenarios/nova/boot-server-associate-and-dissociate-floating-ip.json index fbf44e56..1f880767 100644 --- a/samples/tasks/scenarios/nova/boot-server-associate-and-dissociate-floating-ip.json +++ b/samples/tasks/scenarios/nova/boot-server-associate-and-dissociate-floating-ip.json @@ -12,7 +12,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" } }, "context": { diff --git a/samples/tasks/scenarios/nova/boot-server-associate-and-dissociate-floating-ip.yaml b/samples/tasks/scenarios/nova/boot-server-associate-and-dissociate-floating-ip.yaml index 48da66c5..1e397d12 100644 --- a/samples/tasks/scenarios/nova/boot-server-associate-and-dissociate-floating-ip.yaml +++ b/samples/tasks/scenarios/nova/boot-server-associate-and-dissociate-floating-ip.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" runner: type: "constant" times: 5 diff --git a/samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-live-migrate.json b/samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-live-migrate.json index 4b0aad88..2b6e69db 100644 --- a/samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-live-migrate.json +++ b/samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-live-migrate.json @@ -6,7 +6,7 @@ "size": 10, "block_migration": false, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "flavor": { "name": "{{flavor_name}}" diff --git a/samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-live-migrate.yaml b/samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-live-migrate.yaml index 04452625..eaf40726 100644 --- a/samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-live-migrate.yaml +++ b/samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-live-migrate.yaml @@ -5,7 +5,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" size: 10 block_migration: false boot_server_kwargs: {} diff --git a/samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-resize.json b/samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-resize.json index b641b3f2..093b0f43 100644 --- a/samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-resize.json +++ b/samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-resize.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "to_flavor": { "name": "m1.small" diff --git a/samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-resize.yaml b/samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-resize.yaml index 0b7d966f..4a1a8047 100644 --- a/samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-resize.yaml +++ b/samples/tasks/scenarios/nova/boot-server-attach-created-volume-and-resize.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" to_flavor: name: "m1.small" confirm: true diff --git a/samples/tasks/scenarios/nova/boot-server-from-volume-and-live-migrate.json b/samples/tasks/scenarios/nova/boot-server-from-volume-and-live-migrate.json index 4cc370bf..5fe80a1a 100755 --- a/samples/tasks/scenarios/nova/boot-server-from-volume-and-live-migrate.json +++ b/samples/tasks/scenarios/nova/boot-server-from-volume-and-live-migrate.json @@ -8,7 +8,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "block_migration": false, "volume_size": 10, diff --git a/samples/tasks/scenarios/nova/boot-server-from-volume-and-live-migrate.yaml b/samples/tasks/scenarios/nova/boot-server-from-volume-and-live-migrate.yaml index 8fde4a45..b5227e19 100755 --- a/samples/tasks/scenarios/nova/boot-server-from-volume-and-live-migrate.yaml +++ b/samples/tasks/scenarios/nova/boot-server-from-volume-and-live-migrate.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" block_migration: false volume_size: 10 volume_type: "{{volume_type}}" diff --git a/samples/tasks/scenarios/nova/boot-snapshot-boot-delete.json b/samples/tasks/scenarios/nova/boot-snapshot-boot-delete.json index 4893e8d4..ba41ba0e 100644 --- a/samples/tasks/scenarios/nova/boot-snapshot-boot-delete.json +++ b/samples/tasks/scenarios/nova/boot-snapshot-boot-delete.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "force_delete": false }, diff --git a/samples/tasks/scenarios/nova/boot-snapshot-boot-delete.yaml b/samples/tasks/scenarios/nova/boot-snapshot-boot-delete.yaml index d7573c32..ffacd319 100644 --- a/samples/tasks/scenarios/nova/boot-snapshot-boot-delete.yaml +++ b/samples/tasks/scenarios/nova/boot-snapshot-boot-delete.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" force_delete: false runner: type: "constant" diff --git a/samples/tasks/scenarios/nova/boot.json b/samples/tasks/scenarios/nova/boot.json index 7dc5b160..5169ae56 100644 --- a/samples/tasks/scenarios/nova/boot.json +++ b/samples/tasks/scenarios/nova/boot.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" } }, "runner": { diff --git a/samples/tasks/scenarios/nova/boot.yaml b/samples/tasks/scenarios/nova/boot.yaml index 771d1e16..1567df79 100644 --- a/samples/tasks/scenarios/nova/boot.yaml +++ b/samples/tasks/scenarios/nova/boot.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" runner: type: "constant" times: 10 diff --git a/samples/tasks/scenarios/nova/create-aggregate-add-host-and-boot-server.json b/samples/tasks/scenarios/nova/create-aggregate-add-host-and-boot-server.json index 07678385..5d86a065 100644 --- a/samples/tasks/scenarios/nova/create-aggregate-add-host-and-boot-server.json +++ b/samples/tasks/scenarios/nova/create-aggregate-add-host-and-boot-server.json @@ -3,7 +3,7 @@ { "args": { "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "metadata": { "test_metadata": "true" diff --git a/samples/tasks/scenarios/nova/create-aggregate-add-host-and-boot-server.yaml b/samples/tasks/scenarios/nova/create-aggregate-add-host-and-boot-server.yaml index fbe721d0..b0d58865 100644 --- a/samples/tasks/scenarios/nova/create-aggregate-add-host-and-boot-server.yaml +++ b/samples/tasks/scenarios/nova/create-aggregate-add-host-and-boot-server.yaml @@ -3,7 +3,7 @@ - args: image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" metadata: test_metadata: "true" availability_zone: "nova" diff --git a/samples/tasks/scenarios/nova/list-servers.json b/samples/tasks/scenarios/nova/list-servers.json index ac1d8670..0eafd709 100644 --- a/samples/tasks/scenarios/nova/list-servers.json +++ b/samples/tasks/scenarios/nova/list-servers.json @@ -20,7 +20,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "servers_per_tenant": 2 } diff --git a/samples/tasks/scenarios/nova/list-servers.yaml b/samples/tasks/scenarios/nova/list-servers.yaml index 656771ed..d08e048f 100644 --- a/samples/tasks/scenarios/nova/list-servers.yaml +++ b/samples/tasks/scenarios/nova/list-servers.yaml @@ -16,5 +16,5 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" servers_per_tenant: 2 diff --git a/samples/tasks/scenarios/nova/pause-and-unpause.json b/samples/tasks/scenarios/nova/pause-and-unpause.json index e4e7c0f7..af24ecab 100644 --- a/samples/tasks/scenarios/nova/pause-and-unpause.json +++ b/samples/tasks/scenarios/nova/pause-and-unpause.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "force_delete": false }, diff --git a/samples/tasks/scenarios/nova/pause-and-unpause.yaml b/samples/tasks/scenarios/nova/pause-and-unpause.yaml index 2c9ef186..d72417fc 100644 --- a/samples/tasks/scenarios/nova/pause-and-unpause.yaml +++ b/samples/tasks/scenarios/nova/pause-and-unpause.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" force_delete: false runner: type: "constant" diff --git a/samples/tasks/scenarios/nova/resize-server.json b/samples/tasks/scenarios/nova/resize-server.json index 10348072..e5f3f98e 100644 --- a/samples/tasks/scenarios/nova/resize-server.json +++ b/samples/tasks/scenarios/nova/resize-server.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "to_flavor": { "name": "m1.small" diff --git a/samples/tasks/scenarios/nova/resize-server.yaml b/samples/tasks/scenarios/nova/resize-server.yaml index f3c7a419..8d41b988 100644 --- a/samples/tasks/scenarios/nova/resize-server.yaml +++ b/samples/tasks/scenarios/nova/resize-server.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" to_flavor: name: "m1.small" confirm: true diff --git a/samples/tasks/scenarios/nova/resize-shutoff-server.json b/samples/tasks/scenarios/nova/resize-shutoff-server.json index 965bdc84..334c26eb 100644 --- a/samples/tasks/scenarios/nova/resize-shutoff-server.json +++ b/samples/tasks/scenarios/nova/resize-shutoff-server.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "to_flavor": { "name": "m1.small" diff --git a/samples/tasks/scenarios/nova/resize-shutoff-server.yaml b/samples/tasks/scenarios/nova/resize-shutoff-server.yaml index 4d0b2961..759b2f22 100644 --- a/samples/tasks/scenarios/nova/resize-shutoff-server.yaml +++ b/samples/tasks/scenarios/nova/resize-shutoff-server.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" to_flavor: name: "m1.small" confirm: true diff --git a/samples/tasks/scenarios/nova/shelve-and-unshelve.json b/samples/tasks/scenarios/nova/shelve-and-unshelve.json index ba298f22..d3986c14 100644 --- a/samples/tasks/scenarios/nova/shelve-and-unshelve.json +++ b/samples/tasks/scenarios/nova/shelve-and-unshelve.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "force_delete": false }, diff --git a/samples/tasks/scenarios/nova/shelve-and-unshelve.yaml b/samples/tasks/scenarios/nova/shelve-and-unshelve.yaml index 7b6f24b9..c02709ad 100644 --- a/samples/tasks/scenarios/nova/shelve-and-unshelve.yaml +++ b/samples/tasks/scenarios/nova/shelve-and-unshelve.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" force_delete: false runner: type: "constant" diff --git a/samples/tasks/scenarios/nova/suspend-and-resume.json b/samples/tasks/scenarios/nova/suspend-and-resume.json index 27f15b4c..04daf890 100644 --- a/samples/tasks/scenarios/nova/suspend-and-resume.json +++ b/samples/tasks/scenarios/nova/suspend-and-resume.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "force_delete": false }, diff --git a/samples/tasks/scenarios/nova/suspend-and-resume.yaml b/samples/tasks/scenarios/nova/suspend-and-resume.yaml index 586b3c3f..97914e57 100644 --- a/samples/tasks/scenarios/nova/suspend-and-resume.yaml +++ b/samples/tasks/scenarios/nova/suspend-and-resume.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" force_delete: false runner: type: "constant" 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 42ef2985..fc602523 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.4-x86_64-uec", + "image": "cirros-0.3.5-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 722d7992..cbf43beb 100644 --- a/samples/tasks/scenarios/senlin/create-and-delete-profile-cluster.yaml +++ b/samples/tasks/scenarios/senlin/create-and-delete-profile-cluster.yaml @@ -19,6 +19,6 @@ properties: name: cirros_server flavor: 1 - image: "cirros-0.3.4-x86_64-uec" + image: "cirros-0.3.5-x86_64-disk" networks: - network: private diff --git a/samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.json b/samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.json index f44214b2..7f40604c 100644 --- a/samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.json +++ b/samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "volume_args": { "size": 2 diff --git a/samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.yaml b/samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.yaml index 7ecc8104..cd79cae1 100644 --- a/samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.yaml +++ b/samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" volume_args: size: 2 fixed_network: "private" diff --git a/samples/tasks/scenarios/vm/boot-runcommand-delete.json b/samples/tasks/scenarios/vm/boot-runcommand-delete.json index 8ccec797..54f773a1 100644 --- a/samples/tasks/scenarios/vm/boot-runcommand-delete.json +++ b/samples/tasks/scenarios/vm/boot-runcommand-delete.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "floating_network": "public", "force_delete": false, diff --git a/samples/tasks/scenarios/vm/boot-runcommand-delete.yaml b/samples/tasks/scenarios/vm/boot-runcommand-delete.yaml index dd47d403..eaa79cd1 100644 --- a/samples/tasks/scenarios/vm/boot-runcommand-delete.yaml +++ b/samples/tasks/scenarios/vm/boot-runcommand-delete.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" floating_network: "public" force_delete: false command: diff --git a/samples/tasks/scenarios/vm/dd-load-test.json b/samples/tasks/scenarios/vm/dd-load-test.json index 64552c85..1374ca29 100644 --- a/samples/tasks/scenarios/vm/dd-load-test.json +++ b/samples/tasks/scenarios/vm/dd-load-test.json @@ -7,7 +7,7 @@ "name": "{{flavor_name}}" }, "image": { - "name": "^cirros.*uec$" + "name": "^cirros.*-disk$" }, "floating_network": "public", "force_delete": false, diff --git a/samples/tasks/scenarios/vm/dd-load-test.yaml b/samples/tasks/scenarios/vm/dd-load-test.yaml index 0a4e4e7a..158eaf47 100644 --- a/samples/tasks/scenarios/vm/dd-load-test.yaml +++ b/samples/tasks/scenarios/vm/dd-load-test.yaml @@ -6,7 +6,7 @@ flavor: name: "{{flavor_name}}" image: - name: "^cirros.*uec$" + name: "^cirros.*-disk$" floating_network: "public" force_delete: false command: