X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fnova%2Fmanifests%2Fvncproxy%2Fcommon.pp;fp=3rdparty%2Fmodules%2Fnova%2Fmanifests%2Fvncproxy%2Fcommon.pp;h=0000000000000000000000000000000000000000;hb=6e1426dc77fb4e5d51f07c187c6f2219431dc31e;hp=15b46330d1ee169e930c2e25c82a26861591432d;hpb=87423ba664cd5f2bb462ebadd08b1a90d0fe1c8d;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/nova/manifests/vncproxy/common.pp b/3rdparty/modules/nova/manifests/vncproxy/common.pp
deleted file mode 100644
index 15b46330d..000000000
--- a/3rdparty/modules/nova/manifests/vncproxy/common.pp
+++ /dev/null
@@ -1,54 +0,0 @@
-# == Class: nova::vncproxy::common
-#
-# [*vncproxy_host*]
-#   (optional) The host of the VNC proxy server
-#   Defaults to false
-#
-# [*vncproxy_protocol*]
-#   (optional) The protocol to communicate with the VNC proxy server
-#   Defaults to 'http'
-#
-# [*vncproxy_port*]
-#   (optional) The port to communicate with the VNC proxy server
-#   Defaults to '6080'
-#
-# [*vncproxy_path*]
-#   (optional) The path at the end of the uri for communication with the VNC proxy server
-#   Defaults to '/vnc_auto.html'
-#
-class nova::vncproxy::common (
-  $vncproxy_host     = undef,
-  $vncproxy_protocol = undef,
-  $vncproxy_port     = undef,
-  $vncproxy_path     = undef,
-) {
-
-  $vncproxy_host_real     = pick(
-    $vncproxy_host,
-    $::nova::compute::vncproxy_host,
-    $::nova::vncproxy::host,
-    false)
-  $vncproxy_protocol_real = pick(
-    $vncproxy_protocol,
-    $::nova::compute::vncproxy_protocol,
-    $::nova::vncproxy::vncproxy_protocol,
-    'http')
-  $vncproxy_port_real     = pick(
-    $vncproxy_port,
-    $::nova::compute::vncproxy_port,
-    $::nova::vncproxy::port,
-    6080)
-  $vncproxy_path_real     = pick(
-    $vncproxy_path,
-    $::nova::compute::vncproxy_path,
-    $::nova::vncproxy::vncproxy_path,
-    '/vnc_auto.html')
-
-  if ($vncproxy_host_real) {
-    $vncproxy_base_url = "${vncproxy_protocol_real}://${vncproxy_host_real}:${vncproxy_port_real}${vncproxy_path_real}"
-    # config for vnc proxy
-    nova_config {
-      'DEFAULT/novncproxy_base_url': value => $vncproxy_base_url;
-    }
-  }
-}