From be4cc631c601e1c765dd08cef3b12d4ffb5302e6 Mon Sep 17 00:00:00 2001
From: "Christopher H. Laco" <claco@chrislaco.com>
Date: Tue, 27 May 2014 20:04:43 -0400
Subject: [PATCH] Fix for issue 942

Removed VXPVNC from monitoring. RHEL does not support and being that
RHEL is a supported platform we need to make sure that the offering
is consistent on both RHEL and Ubuntu.

Issue
https://github.com/rcbops/chef-cookbooks/issues/942

(cherry picked from commit 8b8e203efa5b7b004a8f1e8e5eb8039069d7ffd9)
---
 attributes/default.rb | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/attributes/default.rb b/attributes/default.rb
index ad6f924..6fdadae 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -17,7 +17,6 @@
 default["vips"]["keystone-service-api"] = nil
 default["vips"]["keystone-admin-api"] = nil
 default["vips"]["keystone-internal-api"] = nil
-default["vips"]["nova-xvpvnc-proxy"] = nil
 default["vips"]["nova-api"] = nil
 default["vips"]["nova-api-metadata"] = nil
 default["vips"]["nova-ec2-public"] = nil
@@ -35,7 +34,6 @@
 # List of services we want to ignore when creating keystone endpoints
 default["ha"]["service_ignore_list"] = ['glance-registry',
                                         'nova-api-metadata',
-                                        'nova-xvpvnc-proxy',
                                         'nova-novnc-proxy',
                                         'horizon-dash',
                                         'horizon-dash_ssl',
@@ -152,16 +150,6 @@
     "lb_options" => [],
     "ssl_lb_options" => ["ssl-hello-chk"]
 }
-default["ha"]["available_services"]["nova-xvpvnc-proxy"] = {
-    "role" => "nova-vncproxy",
-    "namespace" => "nova",
-    "service" => "xvpvnc-proxy",
-    "service_type" => "compute",
-    "lb_mode" => "tcp",
-    "lb_algorithm" => "source",
-    "lb_options" => [],
-    "ssl_lb_options" => ["ssl-hello-chk"]
-}
 default["ha"]["available_services"]["horizon-dash"] = {
     "role" => "horizon-server",
     "namespace" => "horizon",