From d5d3cfd3fa0ae66805aade36983c67d008373650 Mon Sep 17 00:00:00 2001
From: Maxime Guyot <Miouge1@users.noreply.github.com>
Date: Mon, 15 Apr 2019 13:22:06 +0200
Subject: [PATCH] Sanitize the cluster_name variable (#4509)
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b104c9543..2b20ceed7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -788,7 +788,7 @@ tf-packet-ubuntu16-default:
TF_VERSION: 0.11.11
PROVIDER: packet
CLUSTER: $CI_COMMIT_REF_NAME
- TF_VAR_cluster_name: $CI_COMMIT_REF_NAME
+ TF_VAR_cluster_name: $CI_COMMIT_REF_SLUG
TF_VAR_number_of_k8s_masters: "1"
TF_VAR_number_of_k8s_nodes: "1"
TF_VAR_plan_k8s_masters: t1.small.x86
@@ -803,7 +803,7 @@ tf-packet-ubuntu18-default:
TF_VERSION: 0.11.11
PROVIDER: packet
CLUSTER: $CI_COMMIT_REF_NAME
- TF_VAR_cluster_name: $CI_COMMIT_REF_NAME
+ TF_VAR_cluster_name: $CI_COMMIT_REF_SLUG
TF_VAR_number_of_k8s_masters: "1"
TF_VAR_number_of_k8s_nodes: "1"
TF_VAR_plan_k8s_masters: t1.small.x86
@@ -820,7 +820,7 @@ tf-apply-ovh:
PROVIDER: openstack
CLUSTER: $CI_COMMIT_REF_NAME
ANSIBLE_TIMEOUT: "60"
- TF_VAR_cluster_name: $CI_COMMIT_REF_NAME
+ TF_VAR_cluster_name: $CI_COMMIT_REF_SLUG
TF_VAR_number_of_k8s_masters: "0"
TF_VAR_number_of_k8s_masters_no_floating_ip: "1"
TF_VAR_number_of_k8s_masters_no_floating_ip_no_etcd: "0"
--
GitLab