From c6dd87ec37e33f7e0b2dd91b4b9c87549cdf48a5 Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Sun, 19 Aug 2012 00:42:50 -0700
Subject: [PATCH] Always configure network

This network class is used to configure both
nodes hosting the network service as well
as compute nodes that are utilizing an external
network service.

This commit ensures that this class is always created.
---
 manifests/nova/compute.pp | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/manifests/nova/compute.pp b/manifests/nova/compute.pp
index 6fce77c..52fbe3c 100644
--- a/manifests/nova/compute.pp
+++ b/manifests/nova/compute.pp
@@ -119,20 +119,16 @@ class openstack::nova::compute (
     }
   }
 
-  # set up configuration for networking
-  # NOTE should the if block be removed? -jtopjian
-  if $enable_network_service {
-    class { 'nova::network':
-      private_interface => $private_interface,
-      public_interface  => $public_interface,
-      fixed_range       => $fixed_range,
-      floating_range    => false,
-      network_manager   => $network_manager,
-      config_overrides  => $network_config,
-      create_networks   => false,
-      enabled           => $enable_network_service,
-      install_service   => $enable_network_service,
-    }
+  class { 'nova::network':
+    private_interface => $private_interface,
+    public_interface  => $public_interface,
+    fixed_range       => $fixed_range,
+    floating_range    => false,
+    network_manager   => $network_manager,
+    config_overrides  => $network_config,
+    create_networks   => false,
+    enabled           => $enable_network_service,
+    install_service   => $enable_network_service,
   }
 
   if $manage_volumes {