From 6268cc83068574ef132c0c27437a5b0edb221a3f Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 14 Nov 2012 13:55:26 +0000 Subject: [PATCH] deployment: set eth1 of sp2 to actual configuration, try to update ngcpcfg of sp1 when sp2 is deployed Boot option ngcpcpip2 might differ from default, so we can't hardcode $DEFAULT_IP2 when deploying sp1. Instead try to autoconfigure it when we're deploying sp2, maybe we don't need it while deploying sp1. If this doesn't work then we'd have to provision the interface using $IP2 in the meanwhile. While at it try to pull changes from shared storage on sp1 when deploying sp2 so both nodes are fully up2date after fresh installation. From: Michael Prokop --- deployment.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deployment.sh b/deployment.sh index c85048a..aa52609 100755 --- a/deployment.sh +++ b/deployment.sh @@ -1280,7 +1280,6 @@ if "$PRO_EDITION" ; then ngcp-network --host=$PEER --peer=$THIS_HOST ngcp-network --host=$PEER --set-interface=lo --shared-ip=none --shared-ipv6=none ngcp-network --host=$PEER --set-interface=lo --ipv6='::1' --ip=auto --netmask=auto --hwaddr=auto - ngcp-network --host=$PEER --set-interface=eth1 --ip=$DEFAULT_IP2 --netmask=$DEFAULT_INTERNAL_NETMASK --type=ha_int ngcp-network --host=$PEER --role=proxy --role=lb --role=mgmt ngcp-network --host=$PEER --set-interface=lo --type=sip_int --type=web_ext --type=sip_ext \ --type=rtp_ext --type=ssh_ext --type=mon_ext --type=web_int @@ -1293,8 +1292,11 @@ if "$PRO_EDITION" ; then else # ROLE = sp2 ngcpcfg pull ngcp-network --host=$THIS_HOST --set-interface=$DEFAULT_INSTALL_DEV --ip=auto --netmask=auto --hwaddr=auto + ngcp-network --host=$THIS_HOST --set-interface=$INTERNAL_DEV --ip=auto --netmask=auto --hwaddr=auto --type=ha_int ngcpcfg commit "deployed /etc/ngcp-config/network.yml on $ROLE" ngcpcfg push --shared-only + ssh-keyscan $PEER >> ~/.ssh/known_hosts + ssh $PEER ngcpcfg pull ngcpcfg build fi EOT