Merge branch 'feat-use-image-names-for-env' into 'master'

Use image name based on the target env

See merge request rc/terraform-openstack!19

.gitlab-ci.yml

@@ -78,7 +78,7 @@ tf-apply:
     - | 
       if [ -z $TF_VAR_image_ohpc ];
       then
-      XDMOD_IMAGES=($(openstack image list --sort-column Name --sort-descending -f value -c Name -c ID | grep -P ' xdmod-\d{14}$' | awk '{print $2}'))
+      XDMOD_IMAGES=($(openstack image list --sort-column Name --sort-descending -f value -c Name -c ID | grep -P ' xdmod-$TARGET_ENV-\d{14}$' | awk '{print $2}'))
       export TF_VAR_image_ohpc="${XDMOD_IMAGES[0]}"
       echo $TF_VAR_image_ohpc
       else