From 6237cb907c4752bc524bc2ca36081fa336718586 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Mon, 28 Aug 2017 20:48:32 +0100
Subject: [PATCH] Use a variable for the public domain name
---
test/Vagrantfile | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/test/Vagrantfile b/test/Vagrantfile
index e18fb80..c4c006f 100644
--- a/test/Vagrantfile
+++ b/test/Vagrantfile
@@ -1,7 +1,9 @@
API_VERSION = "2"
+# Need to match the values set in group_vars/all.
DOMAIN = "minicluster-test.net"
+DOMAIN_PUBLIC = "public.minicluster-test.net"
Vagrant.configure(API_VERSION) do |config|
@@ -21,14 +23,15 @@ Vagrant.configure(API_VERSION) do |config|
# Hosts need to find each other using both the short name and the
# fqdn. Furthermore, the OAuth workflow (even internally) uses the
# public domain, so we also create an entry for that, pointing at a
- # random node.
+ # random node (we assume that the public domain doesn't actually
+ # exist).
config.vm.provision "shell", inline: <<SCRIPT
cat > /etc/hosts <<EOF
127.0.0.1 localhost
192.168.10.10 node1.#{DOMAIN} node1
192.168.10.11 node2.#{DOMAIN} node2
192.168.10.12 node3.#{DOMAIN} node3
-192.168.10.12 hydra.public.#{DOMAIN}
+192.168.10.12 hydra.#{DOMAIN_PUBLIC}
EOF
SCRIPT
--
GitLab