new vcpe image that expects two private networks
diff --git a/xos/cord/models.py b/xos/cord/models.py
index 6b52fb3..7ef63c4 100644
--- a/xos/cord/models.py
+++ b/xos/cord/models.py
@@ -243,7 +243,7 @@
@property
def image(self):
- LOOK_FOR_IMAGES=["ubuntu-vcpe", # ONOS demo machine -- preferred vcpe image
+ LOOK_FOR_IMAGES=["ubuntu-vcpe2", # ONOS demo machine -- preferred vcpe image
"Ubuntu 14.04 LTS", # portal
"Ubuntu-14.04-LTS", # ONOS demo machine
]
diff --git a/xos/observers/vcpe/templates/start-vcpe.sh.j2 b/xos/observers/vcpe/templates/start-vcpe.sh.j2
old mode 100755
new mode 100644
index d06d745..7863b2f
--- a/xos/observers/vcpe/templates/start-vcpe.sh.j2
+++ b/xos/observers/vcpe/templates/start-vcpe.sh.j2
@@ -12,8 +12,8 @@
fi
# Set up networking via pipework
-docker exec vcpe ifconfig eth0 >> /dev/null || pipework eth3 -i eth0 vcpe {{ wan_ip }}/17@192.168.128.1
-docker exec vcpe ifconfig eth1 >> /dev/null || pipework eth2 -i eth1 vcpe 192.168.0.1/24 @{{ vlan_ids[0] }}
+docker exec vcpe ifconfig eth0 >> /dev/null || pipework eth4 -i eth0 vcpe {{ wan_ip }}/17@192.168.128.1
+docker exec vcpe ifconfig eth1 >> /dev/null || pipework eth3 -i eth1 vcpe 192.168.0.1/24 @{{ vlan_ids[0] }}
# Now can start up dnsmasq
docker exec vcpe service dnsmasq start