Merge "Update to latest available CirrOS version 0.3.4"
This commit is contained in:
commit
e7f8ef7bc8
@ -606,10 +606,10 @@
|
||||
#
|
||||
|
||||
# Version of cirros image (string value)
|
||||
#cirros_version = 0.3.2
|
||||
#cirros_version = 0.3.4
|
||||
|
||||
# Cirros image name (string value)
|
||||
#cirros_image = cirros-0.3.2-x86_64-disk.img
|
||||
#cirros_image = cirros-0.3.4-x86_64-disk.img
|
||||
|
||||
# Cirros image base URL (string value)
|
||||
#cirros_base_url = http://download.cirros-cloud.net
|
||||
|
@ -930,7 +930,7 @@
|
||||
GlanceImages.create_and_delete_image:
|
||||
-
|
||||
args:
|
||||
image_location: "http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-disk.img"
|
||||
image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
|
||||
container_format: "bare"
|
||||
disk_format: "qcow2"
|
||||
runner:
|
||||
@ -966,7 +966,7 @@
|
||||
GlanceImages.create_image_and_boot_instances:
|
||||
-
|
||||
args:
|
||||
image_location: "http://download.cirros-cloud.net/0.3.2/cirros-0.3.2-x86_64-disk.img"
|
||||
image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
|
||||
container_format: "bare"
|
||||
disk_format: "qcow2"
|
||||
flavor:
|
||||
|
@ -2,7 +2,7 @@
|
||||
"GlanceImages.create_and_delete_image": [
|
||||
{
|
||||
"args": {
|
||||
"image_location": "http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img",
|
||||
"image_location": "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img",
|
||||
"container_format": "bare",
|
||||
"disk_format": "qcow2"
|
||||
},
|
||||
|
@ -2,7 +2,7 @@
|
||||
GlanceImages.create_and_delete_image:
|
||||
-
|
||||
args:
|
||||
image_location: "http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img"
|
||||
image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
|
||||
container_format: "bare"
|
||||
disk_format: "qcow2"
|
||||
runner:
|
||||
|
@ -2,7 +2,7 @@
|
||||
"GlanceImages.create_and_list_image": [
|
||||
{
|
||||
"args": {
|
||||
"image_location": "http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img",
|
||||
"image_location": "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img",
|
||||
"container_format": "bare",
|
||||
"disk_format": "qcow2"
|
||||
},
|
||||
|
@ -2,7 +2,7 @@
|
||||
GlanceImages.create_and_list_image:
|
||||
-
|
||||
args:
|
||||
image_location: "http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img"
|
||||
image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
|
||||
container_format: "bare"
|
||||
disk_format: "qcow2"
|
||||
runner:
|
||||
|
@ -2,7 +2,7 @@
|
||||
"GlanceImages.create_image_and_boot_instances": [
|
||||
{
|
||||
"args": {
|
||||
"image_location": "http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img",
|
||||
"image_location": "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img",
|
||||
"container_format": "bare",
|
||||
"disk_format": "qcow2",
|
||||
"flavor": {
|
||||
|
@ -2,7 +2,7 @@
|
||||
GlanceImages.create_image_and_boot_instances:
|
||||
-
|
||||
args:
|
||||
image_location: "http://download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img"
|
||||
image_location: "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img"
|
||||
container_format: "bare"
|
||||
disk_format: "qcow2"
|
||||
flavor:
|
||||
|
@ -87,7 +87,7 @@ class ServerGeneratorTestCase(test.ScenarioTestCase):
|
||||
"servers": {
|
||||
"servers_per_tenant": 5,
|
||||
"image": {
|
||||
"name": "cirros-0.3.2-x86_64-uec",
|
||||
"name": "cirros-0.3.4-x86_64-uec",
|
||||
},
|
||||
"flavor": {
|
||||
"name": "m1.tiny",
|
||||
@ -140,7 +140,7 @@ class ServerGeneratorTestCase(test.ScenarioTestCase):
|
||||
"servers": {
|
||||
"servers_per_tenant": 5,
|
||||
"image": {
|
||||
"name": "cirros-0.3.2-x86_64-uec",
|
||||
"name": "cirros-0.3.4-x86_64-uec",
|
||||
},
|
||||
"flavor": {
|
||||
"name": "m1.tiny",
|
||||
|
Loading…
Reference in New Issue
Block a user