From 58e12e8d7cf283dd215a1060e460de24aa94a007 Mon Sep 17 00:00:00 2001
From: handreas <andreas.hamacher@monash.edu>
Date: Mon, 2 Mar 2020 01:39:20 +0000
Subject: [PATCH] syntax fix
Former-commit-id: 050b931fbcb6cddf9d4348cf57300a261bd3284c
---
.gitlab-ci.yml | 2 +-
CICD/heat/gc_HOT.yaml | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e438efc9..49f5dbec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
variables:
GIT_SUBMODULE_STRATEGY: recursive
- STACKNAME: CICD_reporef$CI_COMMIT_REF_NAME
+ STACKNAME: CICD_aciab_f$CI_COMMIT_REF_NAME
NECTAR_ALLOCATION: HPCCICD
ANSIBLE_HOST_KEY_CHECKING: "False"
DEFAULT_PATH: "CICD"
diff --git a/CICD/heat/gc_HOT.yaml b/CICD/heat/gc_HOT.yaml
index a1def248..ed52ead1 100644
--- a/CICD/heat/gc_HOT.yaml
+++ b/CICD/heat/gc_HOT.yaml
@@ -13,11 +13,7 @@ parameters:
type: string
label: Image ID
description: Centos Image
-<<<<<<< HEAD
- default: c47c3acb-9657-4243-9e14-e6c676157e3b #with Networkmanager
-=======
default: c47c3acb-9657-4243-9e14-e6c676157e3b #with NetworkManager
->>>>>>> origin/devel
ssh_key:
type: string
default: gc_key
--
GitLab