X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=systest%2FMakefile;h=b2a66ec9da685a4756fa98257a3c91ff1471c023;hb=046b6665632fafbd4a62d116f92fbd2344580128;hp=6321901ff3c76714cc2e32c1769d9985201bd7c3;hpb=dbada22a91407ded3f66e93a7f4b165147ec7db1;p=osm%2Fdevops.git

diff --git a/systest/Makefile b/systest/Makefile
index 6321901f..b2a66ec9 100644
--- a/systest/Makefile
+++ b/systest/Makefile
@@ -26,7 +26,7 @@ OSM_HOSTNAME ?=
 OSM_RO_HOSTNAME ?=
 OS_AUTH_URL ?=
 OS_USERNAME ?=
-OS_PASSWORD_NAME ?=
+OS_PASSWORD ?=
 OS_PROJECT_NAME ?=
 VIM_CONFIG ?=
 VCD_AUTH_URL ?=
@@ -34,6 +34,7 @@ VCD_USERNAME ?=
 VCD_PASSWORD ?=
 VCD_TENANT_NAME ?=
 VCD_ORGANIZATION ?=
+VIM_EMU ?=
 
 TOPDIR=$(shell readlink -f .|sed -e 's/systest.*//')
 
@@ -169,11 +170,16 @@ images/cache/Fedora-x86_64-20-20131211.1-sda-pong.qcow2:
 OSM_IMAGE_PREFIX ?=
 sys_path ?= $(TOPDIR)systest
 
+ifdef VIM_EMU 
+# VIM emulator does not need images pushed to glance.
+else
 ifdef OS_AUTH_URL
 images/%.qcow2 images/%.img:
 	$(Q)openstack image show $(OSM_IMAGE_PREFIX)$(shell basename $@) || \
           sh -c "make images/cache/$(shell basename $@) && openstack image create --file images/cache/$(shell basename $@) $(OSM_IMAGE_PREFIX)$(shell basename $@)"
 endif
+endif
+
 ifdef VCD_AUTH_URL
 images/%.img:
 	ovf_converter images/cache/$(OSM_IMAGE_PREFIX)$(shell basename $@) -n cirros