From: Thierry Parmentelat Date: Tue, 25 Oct 2011 16:31:11 +0000 (+0200) Subject: rename sfa-server.py into sfa-start.py X-Git-Tag: sfa-1.1-1~41 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=3961165f3cbf33b0b154db3140398e0ed383acbd rename sfa-server.py into sfa-start.py --- diff --git a/INSTALL.txt b/INSTALL.txt index d748883f..cc59cebd 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -63,9 +63,9 @@ This will initialize /etc/sfa/authorities/server.key from /etc/sfa/authorities/p This will start Registry, Slice Manager and Aggregate Manager. Your ps command output would look like: # ps -ef | grep python -root 24944 1 0 May11 ? 00:00:00 /usr/bin/python /usr/bin/sfa-server.py -r -d -root 24957 1 0 May11 ? 00:00:00 /usr/bin/python /usr/bin/sfa-server.py -a -d -root 24970 1 0 May11 ? 00:00:00 /usr/bin/python /usr/bin/sfa-server.py -s -d +root 24944 1 0 May11 ? 00:00:00 /usr/bin/python /usr/bin/sfa-start.py -r -d +root 24957 1 0 May11 ? 00:00:00 /usr/bin/python /usr/bin/sfa-start.py -a -d +root 24970 1 0 May11 ? 00:00:00 /usr/bin/python /usr/bin/sfa-start.py -s -d ------- 4) Configure SFA client: diff --git a/Makefile b/Makefile index 94669614..c8cc28dc 100644 --- a/Makefile +++ b/Makefile @@ -125,7 +125,7 @@ sfiAddAttribute.py sfiAddSliver.py sfiDeleteAttribute.py sfiDeleteSliver.py sfiL sfiListSlivers.py sfadump.py BINS = ./config/sfa-config-tty ./config/gen-sfa-cm-config.py \ - ./sfa/plc/sfa-import-plc.py ./sfa/plc/sfa-nuke-plc.py ./sfa/server/sfa-server.py \ + ./sfa/plc/sfa-import-plc.py ./sfa/plc/sfa-nuke-plc.py ./sfa/server/sfa-start.py \ $(foreach client,$(CLIENTS),./sfa/client/$(client)) sync: diff --git a/setup.py b/setup.py index b10be90b..019f5359 100755 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ bins = [ 'sfa/plc/sfa-import-plc.py', 'sfa/plc/sfa-nuke-plc.py', 'sfa/server/sfa-ca.py', - 'sfa/server/sfa-server.py', + 'sfa/server/sfa-start.py', 'sfa/server/sfa-clean-peer-records.py', 'sfa/server/sfa_component_setup.py', 'sfa/client/sfi.py', diff --git a/sfa.spec b/sfa.spec index 4f10df47..f39ab0ec 100644 --- a/sfa.spec +++ b/sfa.spec @@ -121,7 +121,7 @@ rm -rf $RPM_BUILD_ROOT %files # sfa and sfatables depend each other. -%{_bindir}/sfa-server.py* +%{_bindir}/sfa-start.py* /etc/sfatables/* %{python_sitelib}/* %{_bindir}/keyconvert.py* diff --git a/sfa/init.d/sfa b/sfa/init.d/sfa index e2fdb108..08975dc7 100755 --- a/sfa/init.d/sfa +++ b/sfa/init.d/sfa @@ -62,18 +62,18 @@ start() { reload # install peer certs - action $"SFA installing peer certs" daemon /usr/bin/sfa-server.py -t -d $OPTIONS + action $"SFA installing peer certs" daemon /usr/bin/sfa-start.py -t -d $OPTIONS if [ "$SFA_REGISTRY_ENABLED" -eq 1 ]; then - action $"SFA Registry" daemon /usr/bin/sfa-server.py -r -d $OPTIONS + action $"SFA Registry" daemon /usr/bin/sfa-start.py -r -d $OPTIONS fi if [ "$SFA_AGGREGATE_ENABLED" -eq 1 ]; then - action $"SFA Aggregate" daemon /usr/bin/sfa-server.py -a -d $OPTIONS + action $"SFA Aggregate" daemon /usr/bin/sfa-start.py -a -d $OPTIONS fi if [ "$SFA_SM_ENABLED" -eq 1 ]; then - action "SFA SliceMgr" daemon /usr/bin/sfa-server.py -s -d $OPTIONS + action "SFA SliceMgr" daemon /usr/bin/sfa-start.py -s -d $OPTIONS fi if [ "$SFA_FLASHPOLICY_ENABLED" -eq 1 ]; then @@ -81,15 +81,15 @@ start() { fi RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sfa-server.py + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sfa-start.py } stop() { - action $"Shutting down SFA" killproc sfa-server.py + action $"Shutting down SFA" killproc sfa-start.py RETVAL=$? - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sfa-server.py + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sfa-start.py } @@ -99,13 +99,13 @@ case "$1" in reload) reload force ;; restart) stop; start ;; condrestart) - if [ -f /var/lock/subsys/sfa-server.py ]; then + if [ -f /var/lock/subsys/sfa-start.py ]; then stop start fi ;; status) - status sfa-server.py + status sfa-start.py RETVAL=$? ;; *) diff --git a/sfa/init.d/sfa-cm b/sfa/init.d/sfa-cm index eea507cf..cdddf8b1 100755 --- a/sfa/init.d/sfa-cm +++ b/sfa/init.d/sfa-cm @@ -27,7 +27,7 @@ start() { echo "Component Mgr" # make sure server key (nodes private key) exists first init_key - /usr/bin/sfa-server.py -c -d $OPTIONS + /usr/bin/sfa-start.py -c -d $OPTIONS fi RETVAL=$? @@ -38,7 +38,7 @@ start() { stop() { echo -n $"Shutting down SFA: " - killproc sfa-server.py + killproc sfa-start.py RETVAL=$? echo diff --git a/sfa/server/sfa-server.py b/sfa/server/sfa-start.py similarity index 99% rename from sfa/server/sfa-server.py rename to sfa/server/sfa-start.py index fadb1d3d..379c72d1 100755 --- a/sfa/server/sfa-server.py +++ b/sfa/server/sfa-start.py @@ -256,7 +256,7 @@ def update_cert_records(gids): def main(): # Generate command line parser - parser = OptionParser(usage="sfa-server [options]") + parser = OptionParser(usage="sfa-start.py [options]") parser.add_option("-r", "--registry", dest="registry", action="store_true", help="run registry server", default=False) parser.add_option("-s", "--slicemgr", dest="sm", action="store_true", diff --git a/tools/Makefile b/tools/Makefile index 63bb7650..010f0194 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -6,7 +6,7 @@ all:deps deps: server.png client.png server.dg: $(DEPTOOLS) - py2depgraph.py ../sfa/server/sfa-server.py > $@ + py2depgraph.py ../sfa/server/sfa-start.py > $@ client.dg: $(DEPTOOLS) py2depgraph.py ../sfa/client/sfi.py > $@