Merge branch 'noslicemgr' into nocomponent

diff --git a/config/sfa-config-tty b/config/sfa-config-tty
index ce25b56..029cfa1 100755 (executable)
--- a/config/sfa-config-tty
+++ b/config/sfa-config-tty
@@ -28,7 +28,6 @@ usual_variables = [
     "SFA_REGISTRY_ROOT_AUTH",
     "SFA_REGISTRY_HOST",
     "SFA_AGGREGATE_HOST",
-    "SFA_SM_HOST",
     "SFA_DB_HOST",
 ]
 
@@ -230,7 +229,8 @@ def reload_service():
 def restart_service():
     services = ('sfa-db', 'sfa-aggregate', 'sfa-registry')
     for service in services:
-        restart = ("systemctl -q is-active {s} && {{ echo restarting {s} ; systemctl restart {s}; }}"
+        restart = ("systemctl -q is-active {s} && "
+                   "{{ echo restarting {s} ; systemctl restart {s}; }}"
                    .format(s=service))
         os.system(restart)
 

diff --git a/wsdl/Makefile b/wsdl/Makefile
index c24b1e1..78dc70d 100644 (file)
--- a/wsdl/Makefile
+++ b/wsdl/Makefile
@@ -1,6 +1,6 @@
 # attempt to update at build-time
 
-INTERFACES=sfa registry slice-manager aggregate
+INTERFACES=sfa registry aggregate
 
 WSDLS = $(foreach interface,$(INTERFACES),$(interface).wsdl)
 HTMLS = $(foreach interface,$(INTERFACES),$(interface).html)
@@ -11,20 +11,17 @@ all: $(WSDLS) $(HTMLS)
 #TEMPORARY_OFF = yes
 
 ifdef TEMPORARY_OFF
-registry.wsdl slice-manager.wsdl aggregate.wsdl sfa.wsdl:
+registry.wsdl aggregate.wsdl sfa.wsdl:
        touch $@
 else
 registry.wsdl: sfa2wsdl.py
        PYTHONPATH=../ ./sfa2wsdl.py --registry > $@
 
-slice-manager.wsdl: sfa2wsdl.py
-       PYTHONPATH=../ ./sfa2wsdl.py --slice-manager > $@
-
 aggregate.wsdl: sfa2wsdl.py
        PYTHONPATH=../ ./sfa2wsdl.py --aggregate > $@
 
 sfa.wsdl: sfa2wsdl.py
-       PYTHONPATH=../ ./sfa2wsdl.py --registry --slice-manager --aggregate > $@
+       PYTHONPATH=../ ./sfa2wsdl.py --registry --aggregate > $@
 endif
 
 #################### install