From 76a47c341bb311fc2817871fdc109a665ce51fbd Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Tue, 12 May 2020 13:44:35 +0000
Subject: [PATCH] Resolve "Possible conflicting droplet names for multiple MR
of the same issue"
---
openappstack/__main__.py | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/openappstack/__main__.py b/openappstack/__main__.py
index 849d6fd7e..97d265567 100755
--- a/openappstack/__main__.py
+++ b/openappstack/__main__.py
@@ -20,6 +20,7 @@ Install requirements:
import argparse
import logging
+from math import floor
import os
import sys
import greenhost_cloud
@@ -275,13 +276,9 @@ def create(clus, args): # pylint: disable=too-many-branches
if len(args.domain) + len(args.subdomain) + 1 > MAX_DOMAIN_LENGTH:
if args.truncate_subdomain:
- required_length = MAX_DOMAIN_LENGTH - len(args.domain) - 1
- # UGLY WORKAROUND, fix https://open.greenhost.net/openappstack/openappstack/-/issues/572
- if args.subdomain[-3:] == '.ci':
- subdomain = args.subdomain[0:required_length-3] + '.ci'
- else:
- # END OF UGLY WORKAROUND
- subdomain = args.subdomain[0:required_length]
+ half_required_length = floor((MAX_DOMAIN_LENGTH - len(args.domain) - 1)/2)
+ subdomain = args.subdomain[:half_required_length]
+ subdomain += args.subdomain[-half_required_length:]
log.warning('Subdomain truncated to "%s"', subdomain)
else:
log.error(('ERROR: --subdomain argument is too long. Domain '
--
GitLab