Merge pull request #80 from cloudnull/issue942

Merged automatically by jenkins after successful build test
rcbops-cookbooks · May 25, 2014 · eacc7e7 · eacc7e7
2 parents 9360339 + 8b8e203
commit eacc7e7
Showing 1 changed file with 0 additions and 12 deletions.
diff --git 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",