From 3b1dd68ae9fa8a1195bd455c1c430c4ce8376503 Mon Sep 17 00:00:00 2001
From: Ian Southam <isoutham@schubergphilis.com>
Date: Wed, 28 Jan 2015 15:15:10 +0100
Subject: [PATCH] Remove vpc_router_svcs because they will be the same as any
 other router (soon) One question is apache2

---
 .../config/opt/cloud/bin/patchsystemvm.sh     | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/systemvm/patches/debian/config/opt/cloud/bin/patchsystemvm.sh b/systemvm/patches/debian/config/opt/cloud/bin/patchsystemvm.sh
index 9cb02502ef1..9a47f8eac27 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/patchsystemvm.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/patchsystemvm.sh
@@ -95,20 +95,6 @@ routing_svcs() {
    fi
 }
 
-vpcrouting_svcs() {
-   chkconfig cloud off
-   chkconfig haproxy on ; 
-   chkconfig ssh on
-   chkconfig nfs-common off
-   chkconfig portmap off
-   chkconfig dnsmasq on
-   chkconfig keepalived off
-   chkconfig conntrackd off
-   chkconfig apache2 off
-   echo "ssh haproxy dnsmasq" > /var/cache/cloud/enabled_svcs
-   echo "cloud cloud-passwd-srvr apache2 nfs-common portmap keepalived conntrackd" > /var/cache/cloud/disabled_svcs
-}
-
 dhcpsrvr_svcs() {
    chkconfig cloud off
    chkconfig cloud-passwd-srvr on ; 
@@ -215,16 +201,6 @@ then
   fi
 fi
 
-if [ "$TYPE" == "vpcrouter" ]
-then
-  vpcrouting_svcs
-  if [ $? -gt 0 ]
-  then
-    printf "Failed to execute vpcrouting_svcs\n" >$logfile
-    exit 6
-  fi
-fi
-
 if [ "$TYPE" == "dhcpsrvr" ]
 then
   dhcpsrvr_svcs