From 4e2684090fbddb2705af43fd2fca04b2ecb8a9c6 Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Sun, 19 Aug 2012 00:38:50 -0700
Subject: [PATCH] Pass enabled flag to nova::vncproxy

This commit passes the openstack::nova::controller
parameter enabled to nova::vncproxy to allow
nova controller to be built where this service is
installed but not currently enabled.

This is intended to support active-passive HA.
---
 manifests/nova/controller.pp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/manifests/nova/controller.pp b/manifests/nova/controller.pp
index a288d40..0e15f35 100644
--- a/manifests/nova/controller.pp
+++ b/manifests/nova/controller.pp
@@ -160,11 +160,10 @@ class openstack::nova::controller (
     enabled => $enabled,
   }
 
-  # NOTE should this just be enabled => $vnc_enabled? -jtopjian
   if $vnc_enabled {
     class { 'nova::vncproxy':
-      enabled => true,
       host    => $public_address,
+      enabled => $enabled,
     }
   }