Fix broken jobs due to image change

The cirros image has been changed to 0.4.0 and so the image
name needs updating and network config adding.

Change-Id: I77b52d34697268e95813b0be7e5a48e6a18e0399
This commit is contained in:
Christopher Brown 2019-04-08 20:49:41 +01:00
parent 6723ccc4bf
commit 2911e3809e
6 changed files with 11 additions and 7 deletions

View File

@ -8,7 +8,7 @@ parameters:
- custom_constraint: nova.flavor
image:
type: string
default: cirros-0.3.5-x86_64-disk
default: cirros-0.4.0-x86_64-disk
constraints:
- custom_constraint: glance.image
scaling_adjustment:
@ -30,6 +30,8 @@ resources:
properties:
image: { get_param: image }
flavor: { get_param: flavor }
networks:
- allocate_network: none
min_size: 1
desired_capacity: 3
max_size: { get_param: max_size }

View File

@ -14,7 +14,7 @@ parameters:
- range: {min: 1}
instance_image:
type: string
default: cirros-0.3.5-x86_64-disk
default: cirros-0.4.0-x86_64-disk
instance_volume_size:
type: number
description: Size of volume to attach to instance

View File

@ -7,7 +7,7 @@ parameters:
default: public
image:
type: string
default: cirros-0.3.5-x86_64-disk
default: cirros-0.4.0-x86_64-disk
flavor:
type: string
default: m1.tiny

View File

@ -4,7 +4,7 @@ parameters:
# set all correct defaults for parameters before launch test
image:
type: string
default: cirros-0.3.5-x86_64-disk
default: cirros-0.4.0-x86_64-disk
flavor:
type: string
default: m1.tiny
@ -26,6 +26,8 @@ resources:
properties:
image: {get_param: image}
flavor: {get_param: flavor}
networks:
- allocate_network: none
cinder_volume:
type: OS::Cinder::Volume
properties:

View File

@ -25,6 +25,6 @@
properties:
name: cirros_server
flavor: 1
image: "cirros-0.3.5-x86_64-disk"
image: "cirros-0.4.0-x86_64-disk"
networks:
- network: private

View File

@ -325,8 +325,8 @@ class HeatScenario(scenario.OpenStackScenario):
{"key": output_key, "id": stack.id})
platform_params = self.context["env"]["spec"]["existing@openstack"]
verify = (platform_params["https_cacert"]
if not platform_params["https_insecure"]
verify = (platform_params.get("https_cacert")
if not platform_params.get("https_insecure")
else False)
with atomic.ActionTimer(self, "heat.%s_webhook" % output_key):
requests.post(url, verify=verify).raise_for_status()