Merge "Use cirros image location from reclass in salttest for states"
diff --git a/runtest/salttest/states/openstack/glancev2.sls b/runtest/salttest/states/openstack/glancev2.sls
index fb6f83e..02d45ed 100644
--- a/runtest/salttest/states/openstack/glancev2.sls
+++ b/runtest/salttest/states/openstack/glancev2.sls
@@ -1,11 +1,11 @@
{%- if pillar.get('runtest',{}).get('openstack_version') not in ('stable/mitaka', 'stable/newton') -%}
-{%- set glance_location = 'https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img' %}
+{%- from "runtest/map.jinja" import tempest with context %}
{%- set glance_properties = '{"container_format": "bare", "disk_format": "raw", "protected": false, "tags": ["tags1", "tags2"], "visibility": "public"}' %}
glance_image_present:
glancev2.image_present:
- cloud_name: admin_identity
- name: TestImage
- - location: {{ glance_location }}
+ - location: {{ tempest.local_image_url }}
- image_properties: {{ glance_properties }}
glance_image_absent: