Changeset f1f9aec for fedd/federation

Timestamp:

Feb 21, 2014 10:23:46 AM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

0608d96

Parents:

972993c

Message:

Make quagga paths configurable

File:

• fedd/federation/desktop_access.py (modified) (2 diffs)

fedd/federation/desktop_access.py

@@ -68 +68 @@
         # File containing the routing entries for external networks
         self.external_networks = config.get('access', 'external_networks')
+        # values for locations of zebra and ospfd.
+        self.zebra = config.get('access', 'zebra')
+        if self.zebra is None:
+            self.zebra = '/usr/local/sbin/zebra'
+        self.ospfd = config.get('access', 'ospfd')
+        if self.ospfd is None:
+            self.ospfd = '/usr/local/sbin/ospfd'
+
         self.ssh_identity = None
 
@@ -400 +408 @@
                     my_addr
             # self.set_route('10.0.0.0/8', f, exp_peer)
-            print >>f, '/usr/local/sbin/zebra -d -f %s' % zebra_conf
-            print >>f, '/usr/local/sbin/ospfd -d -f %s' % ospfd_conf
+            print >>f, '%s -d -f %s' % (self.zebra, zebra_conf)
+            print >>f, '%s -d -f %s' % (self.ospfd, ospfd_conf)
             f.close()
             os.chmod(cscript, 0755)