diff --git a/packstack/puppet/templates/nova_common.pp b/packstack/puppet/templates/nova_common.pp
index 99f5e85a1..6d736ebcd 100644
--- a/packstack/puppet/templates/nova_common.pp
+++ b/packstack/puppet/templates/nova_common.pp
@@ -1,3 +1,8 @@
+
+# Ensure Firewall changes happen before nova services start
+# preventing a clash with rules being set by nova-compute and nova-network
+Firewall <| |> -> Class['nova']
+
 nova_config{
     "DEFAULT/metadata_host": value => "%(CONFIG_NOVA_API_HOST)s";
 }