openstack/rally
Code Issues Proposed changes

Update the CirrOS image to 0.4.0.

Browse Source 
Both CirrOS releases 0.3.4 and 0.3.5 are inconsistently used. Now all
sample scenarios will use the latest stable 0.4.0 release. The
image_location setting has also been converted into a Jinja template
variable.

Change-Id: Ic2ea83329d9fe774a5a666c4e988487ef502ce7f
Closes-Bug: 1751322
This commit is contained in:
ekultails 2018-03-19 18:13:30 -04:00
parent 234ead2ead
commit 7c5a5d62a7
16 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
samples/tasks/scenarios/glance/create-and-deactivate-image.json
View File

@ -1,8 +1,9 @@
{% set image_location = image_location or "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" %}
{
"GlanceImages.create_and_deactivate_image": [
{
"args": {
"image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img",
"image_location": "{{ image_location }}",
"container_format": "bare",
"disk_format": "qcow2"
},

3
samples/tasks/scenarios/glance/create-and-deactivate-image.yaml
View File

@ -1,8 +1,9 @@
{% set image_location = image_location or "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" %}
---
GlanceImages.create_and_deactivate_image:
-
args:
image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img"
image_location: "{{ image_location }}"
container_format: "bare"
disk_format: "qcow2"
runner:

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

@ -1,8 +1,9 @@
{% set image_location = image_location or "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" %}
{
"GlanceImages.create_and_delete_image": [
{
"args": {
"image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img",
"image_location": "{{ image_location }}",
"container_format": "bare",
"disk_format": "qcow2"
},

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

@ -1,8 +1,9 @@
{% set image_location = image_location or "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" %}
---
GlanceImages.create_and_delete_image:
-
args:
image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img"
image_location: "{{ image_location }}"
container_format: "bare"
disk_format: "qcow2"
runner:

3
samples/tasks/scenarios/glance/create-and-download-image.json
View File

@ -1,8 +1,9 @@
{% set image_location = image_location or "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" %}
{
"GlanceImages.create_and_download_image": [
{
"args": {
"image_location": "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img",
"image_location": "{{ image_location }}",
"container_format": "bare",
"disk_format": "qcow2"
},

3
samples/tasks/scenarios/glance/create-and-download-image.yaml
View File

@ -1,8 +1,9 @@
{% set image_location = image_location or "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" %}
---
GlanceImages.create_and_download_image:
-
args:
image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
image_location: "{{ image_location }}"
container_format: "bare"
disk_format: "qcow2"
runner:

3
samples/tasks/scenarios/glance/create-and-get-image.json
View File

@ -1,8 +1,9 @@
{% set image_location = image_location or "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" %}
{
"GlanceImages.create_and_get_image": [
{
"args": {
"image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img",
"image_location": "{{ image_location }}",
"container_format": "bare",
"disk_format": "qcow2"
},

3
samples/tasks/scenarios/glance/create-and-get-image.yaml
View File

@ -1,8 +1,9 @@
{% set image_location = image_location or "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" %}
---
GlanceImages.create_and_get_image:
-
args:
image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img"
image_location: "{{ image_location }}"
container_format: "bare"
disk_format: "qcow2"
runner:

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

@ -1,8 +1,9 @@
{% set image_location = image_location or "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" %}
{
"GlanceImages.create_and_list_image": [
{
"args": {
"image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img",
"image_location": "{{ image_location }}",
"container_format": "bare",
"disk_format": "qcow2"
},

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

@ -1,8 +1,9 @@
{% set image_location = image_location or "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" %}
---
GlanceImages.create_and_list_image:
-
args:
image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img"
image_location: "{{ image_location }}"
container_format: "bare"
disk_format: "qcow2"
runner:

3
samples/tasks/scenarios/glance/create-and-update-image.json
View File

@ -1,8 +1,9 @@
{% set image_location = image_location or "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" %}
{
"GlanceImages.create_and_update_image": [
{
"args": {
"image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img",
"image_location": "{{ image_location }}",
"container_format": "bare",
"disk_format": "qcow2"
},

3
samples/tasks/scenarios/glance/create-and-update-image.yaml
View File

@ -1,8 +1,9 @@
{% set image_location = image_location or "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" %}
---
GlanceImages.create_and_update_image:
-
args:
image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img"
image_location: "{{ image_location }}"
container_format: "bare"
disk_format: "qcow2"
runner:

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

@ -1,13 +1,14 @@
{% set flavor_name = flavor_name or "m1.tiny" %}
{% set image_location = image_location or "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" %}
{
"GlanceImages.create_image_and_boot_instances": [
{
"args": {
"image_location": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img",
"image_location": "{{ image_location }}",
"container_format": "bare",
"disk_format": "qcow2",
"flavor": {
"name": "{{flavor_name}}"
"name": "{{ flavor_name }}"
},
"number_instances": 2
},

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

@ -1,13 +1,14 @@
{% set flavor_name = flavor_name or "m1.tiny" %}
{% set image_location = image_location or "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" %}
---
GlanceImages.create_image_and_boot_instances:
-
args:
image_location: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img"
image_location: "{{ image_location }}"
container_format: "bare"
disk_format: "qcow2"
flavor:
name: "{{flavor_name}}"
name: "{{ flavor_name }}"
number_instances: 2
runner:
type: "constant"

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

@ -1,3 +1,4 @@
{% set image_location = image_location or "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" %}
{
"GlanceImages.list_images": [
{
@ -12,7 +13,7 @@
"users_per_tenant": 2
},
"images": {
"image_url": "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img",
"image_url": "{{ image_location }}",
"disk_format": "qcow2",
"container_format": "bare",
"images_per_tenant": 4

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

@ -1,3 +1,4 @@
{% set image_location = image_location or "http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img" %}
---
GlanceImages.list_images:
-
@ -10,7 +11,7 @@
tenants: 2
users_per_tenant: 2
images:
image_url: "http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img"
image_url: "{{ image_location }}"
disk_format: "qcow2"
container_format: "bare"
images_per_tenant: 4