openstack/rally-openstack
Code Issues Proposed changes

[CI] Fix image regexp and version

Browse Source 
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
This commit is contained in:
Anton Studenov 2017-02-16 14:29:06 +03:00
parent a1a5e6a079
commit 680995e738
118 changed files with 158 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/quick_start/gates.rst
View File

@ -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*.

4
doc/source/quick_start/tutorial/step_1_setting_up_env_and_running_benchmark_from_samples.rst
View File

@ -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,

6
doc/source/quick_start/tutorial/step_2_input_task_format.rst
View File

@ -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
},

2
doc/source/quick_start/tutorial/step_3_benchmarking_with_existing_users.rst
View File

@ -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
},

32
doc/source/quick_start/tutorial/step_5_task_templates.rst
View File

@ -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

2
doc/specs/in-progress/pluggable-types.rst
View File

@ -23,7 +23,7 @@ file a user can specify:
.. code-block:: yaml
image:
regex: cirros-.*-uec
regex: cirros-.*-disk
flavor:
name: m1.tiny

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

@ -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

4
rally-jobs/certifcation_task_args.yaml
View File

@ -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

2
rally-jobs/cinder.yaml
View File

@ -1,4 +1,4 @@
{% set image_name = "^(cirros.*uec|TestVM)$" %}
{% set image_name = "^(cirros.*-disk|TestVM)$" %}
{% set flavor_name = "m1.tiny" %}
---
Authenticate.validate_cinder:

2
rally-jobs/extra/autoscaling_group.yaml.template
View File

@ -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:

2
rally-jobs/extra/resource_group_server_with_volume.yaml.template
View File

@ -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

2
rally-jobs/extra/server_with_ports.yaml.template
View File

@ -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

2
rally-jobs/extra/server_with_volume.yaml.template
View File

@ -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

4
rally-jobs/nova.yaml
View File

@ -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 = "" %}
---

2
rally-jobs/rally-keystone-api-v2.yaml
View File

@ -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:
-

2
rally-jobs/rally-neutron-existing-users.yaml
View File

@ -1,4 +1,4 @@
{% set image_name = "^cirros.*uec$" %}
{% set image_name = "^cirros.*-disk$" %}
{% set smoke = 0 %}
---

2
rally-jobs/rally-neutron.yaml
View File

@ -1,4 +1,4 @@
{% set image_name = "^cirros.*uec$" %}
{% set image_name = "^cirros.*-disk$" %}
{% set flavor_name = "m1.tiny" %}
{% set smoke = 0 %}

2
rally-jobs/rally-senlin.yaml
View File

@ -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:

2
rally-jobs/rally.yaml
View File

@ -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:
-

2
rally-jobs/rally_args.yaml
View File

@ -1,3 +1,3 @@
---
image_name: "^cirros.*uec$"
image_name: "^cirros.*-disk$"

4
rally/plugins/openstack/context/api_versions.py
View File

@ -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"

2
rally/plugins/openstack/verification/tempest/config.py
View File

@ -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",

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

@ -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}}"

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

@ -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:

4
samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.json
View File

@ -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": {

4
samples/tasks/scenarios/cinder/create-and-upload-volume-to-image.yaml
View File

@ -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

2
samples/tasks/scenarios/cinder/create-from-image-and-delete-volume.json
View File

@ -4,7 +4,7 @@
"args": {
"size": 1,
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
}
},
"runner": {

2
samples/tasks/scenarios/cinder/create-from-image-and-delete-volume.yaml
View File

@ -4,7 +4,7 @@
args:
size: 1
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
runner:
type: "constant"
times: 2

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

@ -21,7 +21,7 @@
},
"servers": {
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"flavor": {
"name": "{{flavor_name}}"

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

@ -17,7 +17,7 @@
users_per_tenant: 1
servers:
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
flavor:
name: "{{flavor_name}}"
servers_per_tenant: 2

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

@ -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}}"

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

@ -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

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

@ -7,7 +7,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
}
},
"runner": {

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

@ -6,7 +6,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
runner:
type: "constant"
times: 10

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

@ -16,7 +16,7 @@
"name": "m1.tiny"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"servers_per_tenant": 2
}

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

@ -13,5 +13,5 @@
flavor:
name: "m1.tiny"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
servers_per_tenant: 2

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

@ -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"
},

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

@ -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:

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

@ -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"
},

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

@ -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:

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

@ -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": {

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

@ -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:

2
samples/tasks/scenarios/glance/list-images.json
View File

@ -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

2
samples/tasks/scenarios/glance/list-images.yaml
View File

@ -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

2
samples/tasks/scenarios/heat/templates/autoscaling-group.yaml.template
View File

@ -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:

2
samples/tasks/scenarios/heat/templates/resource-group-server-with-volume.yaml.template
View File

@ -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

2
samples/tasks/scenarios/heat/templates/server-with-ports.yaml.template
View File

@ -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

2
samples/tasks/scenarios/heat/templates/server-with-volume.yaml.template
View File

@ -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

2
samples/tasks/scenarios/nova/boot-and-associate-floating-ip.json
View File

@ -12,7 +12,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
}
},
"context": {

2
samples/tasks/scenarios/nova/boot-and-associate-floating-ip.yaml
View File

@ -6,7 +6,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
runner:
type: "constant"
times: 1

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

@ -7,7 +7,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"block_migration": true
},

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

@ -5,7 +5,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
block_migration: true
runner:
type: "constant"

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

@ -10,7 +10,7 @@
"args": {
"count": 5,
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"flavor": {
"name": "{{flavor_name}}"

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

@ -4,7 +4,7 @@
-
args:
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
flavor:
name: "{{flavor_name}}"
count: 5

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

@ -7,7 +7,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"boot_server_kwargs": {}
},

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

@ -6,7 +6,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
boot_server_kwargs: {}
runner:
type: "constant"

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

@ -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
},

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

@ -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"

2
samples/tasks/scenarios/nova/boot-and-get-console-server.json
View File

@ -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": [
{

2
samples/tasks/scenarios/nova/boot-and-get-console-server.yaml
View File

@ -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:
-

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

@ -7,7 +7,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"detailed": true
},

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

@ -6,7 +6,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
detailed: True
runner:
type: "constant"

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

@ -7,7 +7,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"block_migration": false
},

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

@ -5,7 +5,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
block_migration: false
runner:
type: "constant"

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

@ -7,7 +7,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
}
},
"runner": {

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

@ -5,7 +5,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
runner:
type: "constant"
times: 10

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

@ -7,10 +7,10 @@
"name": "{{flavor_name}}"
},
"from_image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"to_image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
}
},
"runner": {

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

@ -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

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

@ -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": [
{

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

@ -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:
-

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

@ -7,7 +7,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
}
},
"runner": {

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

@ -6,7 +6,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
runner:
type: "constant"
times: 10

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

@ -7,7 +7,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"force_delete": false,
"actions": [

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

@ -6,7 +6,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
force_delete: false
actions:
-

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

@ -8,7 +8,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"volume_size": 10,
"volume_type": "{{volume_type}}",

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

@ -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

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

@ -7,7 +7,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"to_flavor": {
"name": "m1.small"

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

@ -6,7 +6,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
to_flavor:
name: "m1.small"
confirm: true

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

@ -8,7 +8,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"volume_size": 10,
"volume_type": "{{volume_type}}"

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

@ -7,7 +7,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
volume_size: 10
volume_type: "{{volume_type}}"
runner:

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

@ -8,7 +8,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"volume_size": 10,
"volume_type": "{{volume_type}}"

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

@ -7,7 +7,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
volume_size: 10
volume_type: "{{volume_type}}"
runner:

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

@ -7,7 +7,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
}
},
"runner": {

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

@ -6,7 +6,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
runner:
type: "constant"
times: 10

2
samples/tasks/scenarios/nova/boot-server-associate-and-dissociate-floating-ip.json
View File

@ -12,7 +12,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
}
},
"context": {

2
samples/tasks/scenarios/nova/boot-server-associate-and-dissociate-floating-ip.yaml
View File

@ -6,7 +6,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
runner:
type: "constant"
times: 5

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

@ -6,7 +6,7 @@
"size": 10,
"block_migration": false,
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"flavor": {
"name": "{{flavor_name}}"

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

@ -5,7 +5,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
size: 10
block_migration: false
boot_server_kwargs: {}

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

@ -7,7 +7,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"to_flavor": {
"name": "m1.small"

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

@ -6,7 +6,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
to_flavor:
name: "m1.small"
confirm: true

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

@ -8,7 +8,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"block_migration": false,
"volume_size": 10,

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

@ -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}}"

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

@ -7,7 +7,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"force_delete": false
},

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

@ -6,7 +6,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
force_delete: false
runner:
type: "constant"

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

@ -7,7 +7,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
}
},
"runner": {

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

@ -6,7 +6,7 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
runner:
type: "constant"
times: 10

2
samples/tasks/scenarios/nova/create-aggregate-add-host-and-boot-server.json
View File

@ -3,7 +3,7 @@
{
"args": {
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"metadata": {
"test_metadata": "true"

2
samples/tasks/scenarios/nova/create-aggregate-add-host-and-boot-server.yaml
View File

@ -3,7 +3,7 @@
-
args:
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
metadata:
test_metadata: "true"
availability_zone: "nova"

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

@ -20,7 +20,7 @@
"name": "{{flavor_name}}"
},
"image": {
"name": "^cirros.*uec$"
"name": "^cirros.*-disk$"
},
"servers_per_tenant": 2
}

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

@ -16,5 +16,5 @@
flavor:
name: "{{flavor_name}}"
image:
name: "^cirros.*uec$"
name: "^cirros.*-disk$"
servers_per_tenant: 2

Some files were not shown because too many files have changed in this diff Show More