Merge "cirros test code changes for VCD"

diff --combined systest/Makefile
index 75ab556,df43019..a5b6303
--- 1/systest/Makefile
--- 2/systest/Makefile
+++ b/systest/Makefile
@@@ -38,7 -38,6 +38,7 @@@ VIM_EMU ?
  
  TOPDIR=$(shell readlink -f .|sed -e 's/systest.*//')
  
 +
  ifdef OS_AUTH_URL
      OPTION_OS_AUTH_URL=--os-url $(OS_AUTH_URL)
  endif
@@@ -193,7 -192,7 +193,7 @@@ endi
  %.openstack: check_openstack_env
        $(Q)$(MAKE) $*
  
- %s.vcd: check_vcd_env
+ %.vcd: check_vcd_env
        $(Q)$(MAKE) $*
  
  cirros: check_OSM_HOSTNAME \