From 2cb855e3592a44f0634bf6b4aae2535577b9ab32 Mon Sep 17 00:00:00 2001
From: edison <edison@cloud.com>
Date: Tue, 21 Sep 2010 18:48:17 -0700
Subject: [PATCH] fix ipallocator package: add correct package name, log file

---
 cloud.spec                                    |  2 ++
 .../rc.d/init.d/cloud-external-ipallocator.in |  4 +--
 wscript_build                                 |  1 +
 wscript_configure                             | 29 +++++++++++++++++++
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/cloud.spec b/cloud.spec
index 42429c11ec3..e3f15fc2164 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -524,6 +524,7 @@ fi
 %{_prefix}/lib*/python*/site-packages/%{name}*
 %attr(0755,root,root) %{_bindir}/cloud-external-ipallocator
 %attr(0755,root,root) %{_initrddir}/cloud-external-ipallocator
+%dir %attr(770,root,root) %{_localstatedir}/log/%{name}/ipallocator
 %doc README
 %doc INSTALL
 %doc HACKING
@@ -610,6 +611,7 @@ fi
 %attr(0755,root,root) %{_bindir}/%{name}-setup-agent
 %dir %attr(770,root,root) %{_localstatedir}/log/%{name}/agent
 
+
 %files console-proxy
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-console*.jar
diff --git a/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-external-ipallocator.in b/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-external-ipallocator.in
index c7f5d501f6d..c5bea2ee37e 100755
--- a/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-external-ipallocator.in
+++ b/python/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-external-ipallocator.in
@@ -14,8 +14,8 @@ whatami=cloud-external-ipallocator
 SHORTNAME="$whatami"
 PIDFILE=@PIDDIR@/"$whatami".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
-LOGFILE=@AGENTLOG@
-PROGNAME="Cloud Agent"
+LOGFILE=@IPALOCATORLOG@
+PROGNAME="External IPAllocator"
 
 unset OPTIONS
 [ -r @SYSCONFDIR@/sysconfig/"$SHORTNAME" ] && source @SYSCONFDIR@/sysconfig/"$SHORTNAME"
diff --git a/wscript_build b/wscript_build
index 7065266758a..86811012a60 100644
--- a/wscript_build
+++ b/wscript_build
@@ -298,6 +298,7 @@ else:
 		("${AGENTLOGDIR}",0770,x),
 		("${USAGELOGDIR}",0770,x),
 		("${CPLOGDIR}",0770,x),
+		("${IPALLOCATORLOGDIR}",0770,x),
 		("${LOCALSTATEDIR}/cache/${MSPATH}",0770,x),
 		("${LOCALSTATEDIR}/cache/${MSPATH}/temp",0770,x),
 		("${LOCALSTATEDIR}/cache/${MSPATH}/work",0770,x),
diff --git a/wscript_configure b/wscript_configure
index 42ff5d6d9b5..60c31b14d2a 100644
--- a/wscript_configure
+++ b/wscript_configure
@@ -144,6 +144,7 @@ except Configure.ConfigurationError,e:
 
 conf.env.AGENTPATH = _join(conf.env.PACKAGE,"agent")
 conf.env.CPPATH = _join(conf.env.PACKAGE,"console-proxy")
+conf.env.IPALLOCATORPATH = _join(conf.env.PACKAGE,"ipallocator")
 conf.env.MSPATH = _join(conf.env.PACKAGE,"management")
 conf.env.USAGEPATH = _join(conf.env.PACKAGE,"usage")
 conf.env.SETUPPATH = _join(conf.env.PACKAGE,"setup")
@@ -259,6 +260,34 @@ conf.env.CLASSPATH = pathsep.join(compilecp)
 conf.check_message_2('Done','GREEN')
 
 # log4j config and property config files require backslash escapes on Windows
+conf.env.VERSION = Utils.g_module.VERSION
+
+conf.env.AGENTLIBDIR = Utils.subst_vars(_join("${LIBDIR}","${AGENTPATH}"),conf.env)
+conf.env.AGENTSYSCONFDIR = Utils.subst_vars(_join("${SYSCONFDIR}","${AGENTPATH}"),conf.env)
+conf.env.AGENTLOGDIR = Utils.subst_vars(_join("${LOCALSTATEDIR}","log","${AGENTPATH}"),conf.env)
+
+conf.env.USAGELOGDIR = Utils.subst_vars(_join("${LOCALSTATEDIR}","log","${USAGEPATH}"),conf.env)
+conf.env.USAGESYSCONFDIR = Utils.subst_vars(_join("${SYSCONFDIR}","${USAGEPATH}"),conf.env)
+
+conf.env.CPLIBDIR = Utils.subst_vars(_join("${LIBDIR}","${CPPATH}"),conf.env)
+conf.env.CPSYSCONFDIR = Utils.subst_vars(_join("${SYSCONFDIR}","${CPPATH}"),conf.env)
+conf.env.CPLOGDIR = Utils.subst_vars(_join("${LOCALSTATEDIR}","log","${CPPATH}"),conf.env)
+
+conf.env.IPALLOCATORLIBDIR = Utils.subst_vars(_join("${LIBDIR}","${IPALLOCATORPATH}"),conf.env)
+conf.env.IPALLOCATORSYSCONFDIR = Utils.subst_vars(_join("${SYSCONFDIR}","${IPALLOCATORPATH}"),conf.env)
+conf.env.IPALLOCATORLOGDIR = Utils.subst_vars(_join("${LOCALSTATEDIR}","log","${IPALLOCATORPATH}"),conf.env)
+
+conf.env.MSLOG = _join(conf.env.MSLOGDIR,"management-server.log")
+conf.env.APISERVERLOG = _join(conf.env.MSLOGDIR,"api-server.log")
+conf.env.AGENTLOG = _join(conf.env.AGENTLOGDIR,"agent.log")
+conf.env.USAGELOG = _join(conf.env.USAGELOGDIR,"usage.log")
+conf.env.CPLOG = _join(conf.env.CPLOGDIR,"console-proxy.log")
+conf.env.IPALOCATORLOG = _join(conf.env.IPALLOCATORLOGDIR,"ipallocator.log")
+
+conf.env.SETUPDATADIR = Utils.subst_vars(_join("${DATADIR}","${SETUPPATH}"),conf.env)
+
+conf.env.SERVERSYSCONFDIR = Utils.subst_vars(_join("${SYSCONFDIR}","${SERVERPATH}"),conf.env)
+
 if conf.env.DISTRO in ["Windows"]:
 	for log in "MSLOG APISERVERLOG AGENTLIBDIR USAGELOG AGENTLOG".split(): conf.env[log] = conf.env[log].replace("\\","\\\\")