From 0e611c17ef11eca8963552c39e57c0fd4f2ac20c Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 17 Oct 2012 22:20:49 +0000 Subject: [PATCH] deployment: restrikt ngcp-network related steps to sp1 host network.yml looks good on sp1 now. Something fishy is still causing broken config files though, a manual 'ngcpcfg build' fixes that, why the 'ngcpcfg build' in the deployment script doesn't solve that yet needs to be investigated... Sadly bootstrapping sp2 is still quite tricky. We might even have to set initial network.yml on PRO systems to what we ship with CE systems so we don't run into merge conflicts. Hmpf. From: Michael Prokop --- deployment.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/deployment.sh b/deployment.sh index e262a6e..52a5b18 100755 --- a/deployment.sh +++ b/deployment.sh @@ -1181,18 +1181,20 @@ if "$PRO_EDITION" ; then exit 0 fi - cp /etc/ngcp-config/network.yml /etc/ngcp-config/network.yml.factory_default + if [ "$ROLE" = "sp1" ] ; then + cp /etc/ngcp-config/network.yml /etc/ngcp-config/network.yml.factory_default - ngcp-network --host=$ROLE --set-interface=lo --set-interface=$DEFAULT_INSTALL_DEV --set-interface=$INTERNAL_DEV - ngcp-network --host=$ROLE --peer=$PEER - ngcp-network --host=$PEER --peer=$ROLE --set-interface=lo - ngcp-network --host=$ROLE --set-interface=$INTERNAL_DEV - ngcp-network --host=$ROLE --move-from=lo --move-to=$INTERNAL_DEV --type=ha_int - ngcp-network --host=$ROLE --set-interface=eth1 --host=$PEER --ip=$DEFAULT_IP2 --netmask=$DEFAULT_INTERNAL_NETMASK --type=ha_int + ngcp-network --host=$ROLE --set-interface=lo --set-interface=$DEFAULT_INSTALL_DEV --set-interface=$INTERNAL_DEV + ngcp-network --host=$ROLE --peer=$PEER + ngcp-network --host=$PEER --peer=$ROLE --set-interface=lo + ngcp-network --host=$ROLE --set-interface=$INTERNAL_DEV + ngcp-network --host=$ROLE --move-from=lo --move-to=$INTERNAL_DEV --type=ha_int + ngcp-network --host=$ROLE --set-interface=eth1 --host=$PEER --ip=$DEFAULT_IP2 --netmask=$DEFAULT_INTERNAL_NETMASK --type=ha_int - cp /etc/ngcp-config/network.yml /mnt/glusterfs/shared_config/network.yml + cp /etc/ngcp-config/network.yml /mnt/glusterfs/shared_config/network.yml - ngcpcfg build + ngcpcfg build + fi EOT fi