Set up default gateway info for CloudLab
diff --git a/xos/configurations/cord-pod/Makefile b/xos/configurations/cord-pod/Makefile
index 606f106..ff4f258 100644
--- a/xos/configurations/cord-pod/Makefile
+++ b/xos/configurations/cord-pod/Makefile
@@ -1,15 +1,15 @@
.PHONY: xos
-xos: nodes.yaml images.yaml vtn_network_cfg_json virtualbng_json
+xos: nodes.yaml images.yaml
sudo docker-compose up -d
../common/wait_for_xos_port.sh 80
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/setup.yaml
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/nodes.yaml
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/images.yaml
-vtn:
+vtn: vtn_network_cfg_json
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/vtn-external.yaml
-cord:
+cord: virtualbng_json
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/mgmt-net.yaml
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /opt/xos/configurations/common/fixtures.yaml
sudo docker-compose run xos python /opt/xos/tosca/run.py padmin@vicci.org /root/setup/cord-vtn-vsg.yaml
diff --git a/xos/configurations/cord-pod/cord-vtn-vsg.yaml b/xos/configurations/cord-pod/cord-vtn-vsg.yaml
index d9fda9b..ac670ca 100644
--- a/xos/configurations/cord-pod/cord-vtn-vsg.yaml
+++ b/xos/configurations/cord-pod/cord-vtn-vsg.yaml
@@ -21,7 +21,7 @@
public_addresses:
type: tosca.nodes.AddressPool
properties:
- addresses: 207.141.192.128/27
+ addresses: 192.168.0.0/24
service_vsg:
type: tosca.nodes.VSGService
@@ -34,9 +34,9 @@
backend_network_label: hpc_client
public_key: { get_artifact: [ SELF, pubkey, LOCAL_FILE] }
private_key_fn: /opt/xos/synchronizers/vcpe/vcpe_private_key
- wan_container_gateway_ip: 207.141.192.158
- wan_container_gateway_mac: a4:23:05:34:56:78
- wan_container_netbits: 27
+ wan_container_gateway_ip: 192.168.0.1
+ wan_container_gateway_mac: 02:42:c0:a8:00:01
+ wan_container_netbits: 24
artifacts:
pubkey: /opt/xos/synchronizers/vcpe/vcpe_public_key
diff --git a/xos/configurations/cord-pod/make-vtn-networkconfig-json.sh b/xos/configurations/cord-pod/make-vtn-networkconfig-json.sh
index 5239267..9f64535 100755
--- a/xos/configurations/cord-pod/make-vtn-networkconfig-json.sh
+++ b/xos/configurations/cord-pod/make-vtn-networkconfig-json.sh
@@ -17,8 +17,8 @@
"sshKeyFile": "/root/node_key",
"publicGateways": [
{
- "gatewayIp": "207.141.192.158",
- "gatewayMac": "a4:23:05:34:56:78"
+ "gatewayIp": "192.168.0.1",
+ "gatewayMac": "02:42:c0:a8:00:01"
}
],
"nodes" : [
@@ -41,7 +41,7 @@
echo $NODE
NODEIP=`getent hosts $NODE | awk '{ print $1 }'`
- PHYPORT=mlx0
+ PHYPORT=veth1
# How to set LOCALIP?
LOCALIPNET="192.168.199"