From ac18dd870ff2de2a5a2064a5ca03e9325fd353ae Mon Sep 17 00:00:00 2001
From: handreas <andreas.hamacher@monash.edu>
Date: Sun, 2 Feb 2020 06:51:21 +0000
Subject: [PATCH] Prefix handling hopefully now pipeline wide

---
 .gitlab-ci.yml                        | 2 +-
 CICD/ansible_create_cluster_script.sh | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d20659a1..272ff106 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
-  STACKNAME: _reporef$CI_COMMIT_REF_NAME
+  STACKNAME: CICD_reporef$CI_COMMIT_REF_NAME
   NECTAR_ALLOCATION: HPCCICD
 
 stages:
diff --git a/CICD/ansible_create_cluster_script.sh b/CICD/ansible_create_cluster_script.sh
index 3aa506f2..b062d4f2 100755
--- a/CICD/ansible_create_cluster_script.sh
+++ b/CICD/ansible_create_cluster_script.sh
@@ -7,9 +7,6 @@ openstack stack list
 
 cd CICD
 
-STACKNAME=CICD$STACKNAME
-
-echo "[ansible_create_cluster_script] Prefixing the Stackname with CICD because heatcicdwrapper does he same"
 python3 ../scripts/make_inventory.py static $STACKNAME | tee ./files/inventory.$STACKNAME && chmod 755 ./files/inventory.$STACKNAME
 grep -qv "I could not find any resouces tagged with project_name:" ./files/inventory.$STACKNAME   #fail if inventory file is empty
 ansible -m ping -i files/inventory.$STACKNAME --key-file ../gc_key.pem all
-- 
GitLab