firewall: add --sync switch to reload_firewall instead of use reload_firewall_sync

circle/firewall/management/commands/reload_firewall.py

@@ -23,5 +23,16 @@ from firewall.tasks.local_tasks import reloadtask
 
 
 
 
 class Command(BaseCommand):
 class Command(BaseCommand):
+
+    def add_arguments(self, parser):
+
+        parser.add_argument('--sync',
+                            action='store_const',
+                            dest='sync',
+                            const=True,
+                            default=False,
+                            help='Delete poll instead of closing it')
+
     def handle(self, *args, **options):
     def handle(self, *args, **options):
-        reloadtask('Vlan')
+
+        reloadtask('Vlan', sync=options["sync"])

circle/firewall/management/commands/reload_firewall_sync.py

-# Copyright 2014 Budapest University of Technology and Economics (BME IK)
-#
-# This file is part of CIRCLE Cloud.
-#
-# CIRCLE is free software: you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation, either version 3 of the License, or (at your option)
-# any later version.
-#
-# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along
-# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
-
-from __future__ import unicode_literals, absolute_import
-
-from django.core.management.base import BaseCommand
-
-from firewall.tasks.local_tasks import reloadtask
-
-
-class Command(BaseCommand):
-    def handle(self, *args, **options):
-        reloadtask('Vlan', sync=True)

requirements/base.txt

@@ -31,7 +31,7 @@ python-dateutil==2.4.2
 pyinotify==0.9.5
 pyinotify==0.9.5
 pytz==2015.4
 pytz==2015.4
 requests==2.7.0
 requests==2.7.0
-salt==2015.5.1
+salt==2014.7.1
 shutilwhich==1.1.0
 shutilwhich==1.1.0
 simplejson==3.7.2
 simplejson==3.7.2
 six==1.9.0
 six==1.9.0