From 2c06022aa12ec8fc0ac3e50de36b900c92bf9817 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 9 Sep 2015 17:59:42 -0400 Subject: Allows domain name to be configured Users may now provide domain_name in the ksgen settings file (along with setting the correct and respective hostnames). This domain name will be used for all of the deployed machines. JIRA: BGS-86 Change-Id: I34b6da07dd565648399ea7a1abf2abe1ae62d91a Signed-off-by: Tim Rozet (cherry picked from commit 1089c79563e61589d105accc3067f6ebbd3020ed) --- foreman/ci/deploy.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'foreman/ci/deploy.sh') diff --git a/foreman/ci/deploy.sh b/foreman/ci/deploy.sh index 3a6f8cd..83d1b81 100755 --- a/foreman/ci/deploy.sh +++ b/foreman/ci/deploy.sh @@ -1107,8 +1107,12 @@ start_virtual_nodes() { ##modify provisioning to do puppet install, config, and foreman check-in ##substitute host_name and dns_server in the provisioning script - host_string=config_nodes_${node}_hostname - host_name=$(eval echo \$$host_string) + host_string=config_nodes_${node}_short_name + short_host_name=$(eval echo \$$host_string) + ##substitute domain_name + domain_name=$config_domain_name + sed -i 's/^domain_name=REPLACE/domain_name='$domain_name'/' vm_nodes_provision.sh + host_name=${short_host_name}.${domain_name} sed -i 's/^host_name=REPLACE/host_name='$host_name'/' vm_nodes_provision.sh ##dns server should be the foreman server sed -i 's/^dns_server=REPLACE/dns_server='${interface_ip_arr[0]}'/' vm_nodes_provision.sh -- cgit 1.2.3-korg