Skip to content
Snippets Groups Projects
Commit 050b931f authored by Andreas Hamacher's avatar Andreas Hamacher
Browse files

syntax fix

parent efe5fc40
No related branches found
No related tags found
1 merge request!297Cicd merge back
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 1
− 1
View file @ 050b931f
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
STACKNAME: CICD_reporef$CI_COMMIT_REF_NAME STACKNAME: CICD_aciab_f$CI_COMMIT_REF_NAME
NECTAR_ALLOCATION: HPCCICD NECTAR_ALLOCATION: HPCCICD
ANSIBLE_HOST_KEY_CHECKING: "False" ANSIBLE_HOST_KEY_CHECKING: "False"
DEFAULT_PATH: "CICD" DEFAULT_PATH: "CICD"
......
CICD/heat/gc_HOT.yaml
+ 0
− 4
View file @ 050b931f
...@@ -13,11 +13,7 @@ parameters: ...@@ -13,11 +13,7 @@ parameters:
type: string type: string
label: Image ID label: Image ID
description: Centos Image description: Centos Image
<<<<<<< HEAD
default: c47c3acb-9657-4243-9e14-e6c676157e3b #with Networkmanager
=======
default: c47c3acb-9657-4243-9e14-e6c676157e3b #with NetworkManager default: c47c3acb-9657-4243-9e14-e6c676157e3b #with NetworkManager
>>>>>>> origin/devel
ssh_key: ssh_key:
type: string type: string
default: gc_key default: gc_key
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment