diff --git a/packstack/plugins/cinder_250.py b/packstack/plugins/cinder_250.py
index 115e41542..5dba00317 100644
--- a/packstack/plugins/cinder_250.py
+++ b/packstack/plugins/cinder_250.py
@@ -363,4 +363,10 @@ def create_manifest(config):
     if config['CONFIG_CEILOMETER_INSTALL'] == 'y':
         manifestdata += getManifestTemplate('cinder_ceilometer.pp')
 
+    hosts = config['CONFIG_NOVA_COMPUTE_HOSTS'].split(",")
+    config['FIREWALL_ALLOWED'] = ",".join(["'%s'" % i.strip() for i in hosts if i.strip()])
+    config['FIREWALL_SERVICE_NAME'] = "cinder"
+    config['FIREWALL_PORTS'] = "'3260', '8776'"
+    manifestdata += getManifestTemplate("firewall.pp")
+
     appendManifestFile(manifestfile, manifestdata)
diff --git a/packstack/puppet/templates/cinder.pp b/packstack/puppet/templates/cinder.pp
index 4f55fdce0..8e31197ce 100644
--- a/packstack/puppet/templates/cinder.pp
+++ b/packstack/puppet/templates/cinder.pp
@@ -31,8 +31,4 @@ class {'cinder::volume::iscsi':
     iscsi_ip_address => '%(CONFIG_CINDER_HOST)s'
 }
 
-firewall { '001 cinder incoming':
-    proto    => 'tcp',
-    dport    => ['3260', '8776'],
-    action   => 'accept',
-}
+