You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/02/04 21:28:58 UTC
[38/50] [abbrv] git commit: updated
refs/heads/feature/systemvm-persistent-config to 4fe7264
Remove vpc_router_svcs because they will be the same as any other router (soon)
One question is apache2
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bafaefd7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bafaefd7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bafaefd7
Branch: refs/heads/feature/systemvm-persistent-config
Commit: bafaefd7b4b3366c7ae595aed00cd9a21c527444
Parents: 586b625
Author: Ian Southam <is...@schubergphilis.com>
Authored: Wed Jan 28 15:15:10 2015 +0100
Committer: wilderrodrigues <wr...@schubergphilis.com>
Committed: Wed Feb 4 18:47:11 2015 +0100
----------------------------------------------------------------------
.../config/opt/cloud/bin/patchsystemvm.sh | 24 --------------------
1 file changed, 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bafaefd7/systemvm/patches/debian/config/opt/cloud/bin/patchsystemvm.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/patchsystemvm.sh b/systemvm/patches/debian/config/opt/cloud/bin/patchsystemvm.sh
index 9cb0250..9a47f8e 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