From 16f2a3924dcc989f9628981125d4ee0c5a6d9343 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Wed, 14 Dec 2016 22:51:14 +0100
Subject: [PATCH] hosts: readdress upstream2 to resolve address conflict

---
 salt-pillar/hosts/init.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt-pillar/hosts/init.sls b/salt-pillar/hosts/init.sls
index 42f62a2..916597c 100644
--- a/salt-pillar/hosts/init.sls
+++ b/salt-pillar/hosts/init.sls
@@ -44,10 +44,10 @@ hosts-inet:
     priv1-gw: 172.20.72.4
     priv2-gw: 172.20.72.5
     upstream1: 172.20.72.6
-    upstream2: 172.20.72.8 #address conflict
     anon1: 172.20.72.7
     c3d2-gw: 172.20.72.8
     c3d2-anon: 172.20.72.9
+    upstream2: 172.20.72.10
   pub:
     pub-gw: 172.20.76.1
   serv: