summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2015-09-22 13:18:04 -0400
committerTim Rozet <trozet@redhat.com>2015-09-22 20:10:56 +0000
commit41c83f471dc4ffcc8df8f31898eece27aceac843 (patch)
tree10b936c948c93071b72b0431575a310f78607815
parente509fa622859aa5bd56a74ab182489e03588c546 (diff)
Fixes bug where puppet fails to run due to domain name
Puppet relies on facter to gather host facts, including domain name. Unfortunately facter gathers domain name by looking at the first domain listed in /etc/resolv.conf, rather than the domain name set on the host. This fix corrects the domain in that file. JIRA: APEX-36 Change-Id: If4e4a0b9f82e562463d97ceeee6b7dfd445e3bdc Signed-off-by: Tim Rozet <trozet@redhat.com> (cherry picked from commit d4ccd3bdf95f4250747f72d0ca98a19f3656d128)
-rwxr-xr-xforeman/ci/vm_nodes_provision.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/foreman/ci/vm_nodes_provision.sh b/foreman/ci/vm_nodes_provision.sh
index 0754e31..ef2b325 100755
--- a/foreman/ci/vm_nodes_provision.sh
+++ b/foreman/ci/vm_nodes_provision.sh
@@ -36,7 +36,7 @@ fi
##modify /etc/resolv.conf to point to foreman
echo "${blue} Configuring resolv.conf with DNS: $dns_server ${reset}"
cat > /etc/resolv.conf << EOF
-search ci.com $domain_name
+search $domain_name
nameserver $dns_server
nameserver 8.8.8.8