From a88ebb863f5c2292fa131c31f2dfb12a047f68c6 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@hp.com>
Date: Sat, 16 May 2015 19:37:22 -0700
Subject: [PATCH] Fix opening public UDP ports

The variable containing the list of UDP ports was defined after
it was being used.  Therefore, public UDP ports were not actually
being open (eg, 5060 on pbx).  Move the definition to a point
before it was being used.

Change-Id: I0411c919132f51bbd033a614f961bea36ea4f6c1
---
 .../openstack_project/manifests/template.pp   | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index 88c83c284d..3635ab3b20 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -34,6 +34,23 @@ class openstack_project::template (
     trusted_ssh_source => $puppetmaster_server,
   }
 
+  if ( $afs ) {
+    $all_udp = concat(
+      $iptables_public_udp_ports, [7001])
+
+    class { 'openafs::client':
+      cell         => 'openstack.org',
+      realm        => 'OPENSTACK.ORG',
+      admin_server => 'kdc.openstack.org',
+      kdcs         => [
+        'kdc01.openstack.org',
+        'kdc02.openstack.org',
+      ],
+    }
+  } else {
+    $all_udp = $iptables_public_udp_ports
+  }
+
   class { 'iptables':
     public_tcp_ports => $iptables_public_tcp_ports,
     public_udp_ports => $all_udp,
@@ -57,23 +74,6 @@ class openstack_project::template (
     }
   }
 
-  if ( $afs ) {
-    $all_udp = concat(
-      $iptables_public_udp_ports, [7001])
-
-    class { 'openafs::client':
-      cell         => 'openstack.org',
-      realm        => 'OPENSTACK.ORG',
-      admin_server => 'kdc.openstack.org',
-      kdcs         => [
-        'kdc01.openstack.org',
-        'kdc02.openstack.org',
-      ],
-    }
-  } else {
-    $all_udp = $iptables_public_udp_ports
-  }
-
   class {'openstack_project::users_install':
     install_users => $install_users
   }