[pisa-src] r985 - in trunk/openwrt/trunk/files/etc: . hip pisa
- From: Thomas Jansen <mithi@xxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Thu, 24 Sep 2009 12:47:04 +0200
Author: tjansen
Date: Thu Sep 24 12:47:03 2009
New Revision: 985
Log:
Updated the configuration for the new test setup.
Two virtual machines (gate1, gate2) running on morpheus act as service
gateways running pisasd. Each has a virtual network containing another
virtual machine (srv1, srv2) that provides services (for now only HTTP).
Modified:
trunk/openwrt/trunk/files/etc/hip/hosts
trunk/openwrt/trunk/files/etc/hosts
trunk/openwrt/trunk/files/etc/pisa/pisacd.conf
Modified: trunk/openwrt/trunk/files/etc/hip/hosts
==============================================================================
--- trunk/openwrt/trunk/files/etc/hip/hosts Wed Sep 23 20:36:40 2009
(r984)
+++ trunk/openwrt/trunk/files/etc/hip/hosts Thu Sep 24 12:47:03 2009
(r985)
@@ -1,3 +1,5 @@
# The name in the second row must match the name in /etc/hosts to let hipd
# know which IP to use.
2001:10:17e5:e586:5f1b:a01b:f5c9:f825 pisa-morpheus
+2001:14:dc2e:4586:27d0:fbde:2e46:d24 pisa-gate1
+2001:12:69af:ac37:6cbb:519d:b319:9b80 pisa-gate2
Modified: trunk/openwrt/trunk/files/etc/hosts
==============================================================================
--- trunk/openwrt/trunk/files/etc/hosts Wed Sep 23 20:36:40 2009 (r984)
+++ trunk/openwrt/trunk/files/etc/hosts Thu Sep 24 12:47:03 2009 (r985)
@@ -1,7 +1,13 @@
127.0.0.1 localhost.
+# Server
192.168.5.1 pisa-morpheus
+# Virtual Machines on morpheus
+192.168.5.21 pisa-gate1
+192.168.5.22 pisa-gate2
+
+# Access Points
192.168.5.101 pisa-ares
192.168.5.102 pisa-aphrodite
192.168.5.103 pisa-apollo
Modified: trunk/openwrt/trunk/files/etc/pisa/pisacd.conf
==============================================================================
--- trunk/openwrt/trunk/files/etc/pisa/pisacd.conf Wed Sep 23 20:36:40
2009 (r984)
+++ trunk/openwrt/trunk/files/etc/pisa/pisacd.conf Thu Sep 24 12:47:03
2009 (r985)
@@ -24,17 +24,23 @@
# A list of all servers we want to connect to.
servers = (
- { # morpheus
- hit = "2001:10:17e5:e586:5f1b:a01b:f5c9:f825";
+ { # gate1, virtual machine on morpheus
+ hit = "2001:14:dc2e:4586:27d0:fbde:2e46:d24";
type = "legacyrouter";
services = (
{
- local = "192.168.44.17";
- remote = "192.168.3.1";
- },
+ local = "192.168.44.2";
+ remote = "192.168.9.2";
+ }
+ );
+ },
+ { # gate2, virtual machine on morpheus
+ hit = "2001:12:69af:ac37:6cbb:519d:b319:9b80";
+ type = "legacyrouter";
+ services = (
{
- local = "192.168.44.18";
- remote = "192.168.3.13";
+ local = "192.168.44.3";
+ remote = "192.168.9.3";
}
);
}
Other related posts:
- » [pisa-src] r985 - in trunk/openwrt/trunk/files/etc: . hip pisa - Thomas Jansen
