Updated Branches: refs/heads/master 7ca488334 -> 074901365
CLOUDSTACK-2324 Since wheezy (temporarily) does not have haproxy, install from squeeze. We cannot install from sid since that version depends on libc6(>=2.15) while wheezy has libc6 at 2.13-38 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/07490136 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/07490136 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/07490136 Branch: refs/heads/master Commit: 074901365fa46bc10953051686a975026758618c Parents: 7ca4883 Author: Chiradeep Vittal <chirad...@apache.org> Authored: Fri May 10 17:11:12 2013 -0700 Committer: Chiradeep Vittal <chirad...@apache.org> Committed: Fri May 10 17:11:12 2013 -0700 ---------------------------------------------------------------------- .../definitions/systemvmtemplate/postinstall.sh | 8 ++++++-- .../definitions/systemvmtemplate64/postinstall.sh | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/07490136/tools/appliance/definitions/systemvmtemplate/postinstall.sh ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh index 38363d9..f532f88 100644 --- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh +++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh @@ -37,8 +37,7 @@ install_packages() { apt-get --no-install-recommends -q -y --force-yes install sysstat # apache apt-get --no-install-recommends -q -y --force-yes install apache2 ssl-cert - # haproxy - apt-get --no-install-recommends -q -y --force-yes install haproxy + # dnsmasq apt-get --no-install-recommends -q -y --force-yes install dnsmasq dnsmasq-utils # nfs client @@ -78,6 +77,11 @@ install_packages() { # cd $PREV # rm -fr /opt/vmware-tools-distrib # apt-get -q -y --force-yes purge build-essential + + # haproxy. Wheezy doesn't have haproxy, install from backports + #apt-get --no-install-recommends -q -y --force-yes install haproxy + wget http://ftp.us.debian.org/debian/pool/main/h/haproxy/haproxy_1.4.8-1_i386.deb + dpkg -i haproxy_1.4.8-1_i386.deb } setup_accounts() { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/07490136/tools/appliance/definitions/systemvmtemplate64/postinstall.sh ---------------------------------------------------------------------- diff --git a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh index 38363d9..3ccf3ce 100644 --- a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh +++ b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh @@ -37,8 +37,7 @@ install_packages() { apt-get --no-install-recommends -q -y --force-yes install sysstat # apache apt-get --no-install-recommends -q -y --force-yes install apache2 ssl-cert - # haproxy - apt-get --no-install-recommends -q -y --force-yes install haproxy + # dnsmasq apt-get --no-install-recommends -q -y --force-yes install dnsmasq dnsmasq-utils # nfs client @@ -78,6 +77,11 @@ install_packages() { # cd $PREV # rm -fr /opt/vmware-tools-distrib # apt-get -q -y --force-yes purge build-essential + + # haproxy. Wheezy doesn't have haproxy temporarily, install from backports + #apt-get --no-install-recommends -q -y --force-yes install haproxy + wget http://ftp.us.debian.org/debian/pool/main/h/haproxy/haproxy_1.4.8-1_amd64.deb + dpkg -i haproxy_1.4.8-1_amd64.deb } setup_accounts() {
