ichavero pushed to openstack-puppet-modules (f22). "Updated patches from f22-patches"

[notifications at fedoraproject.org]

>From 0500ea2497f924559055375794bce1fae60f0c4f Mon Sep 17 00:00:00 2001
From: Ivan Chavero <ichavero at redhat.com>
Date: Tue, 31 Mar 2015 15:38:22 -0700
Subject: Updated patches from f22-patches


diff --git a/0019-move-setting-of-novncproxy_base_url.patch b/0019-move-setting-of-novncproxy_base_url.patch
index bf186d3..dc80845 100644
--- a/0019-move-setting-of-novncproxy_base_url.patch
+++ b/0019-move-setting-of-novncproxy_base_url.patch
@@ -1,4 +1,4 @@
-From c4cdd9c101ce4947bf0a97955335c4f1dc9183b2 Mon Sep 17 00:00:00 2001
+From 65951f3a94df5341a92f592ff8ca3820496c3feb Mon Sep 17 00:00:00 2001
 From: Lars Kellogg-Stedman <lars at redhat.com>
 Date: Fri, 27 Mar 2015 22:44:57 -0400
 Subject: [PATCH] move setting of novncproxy_base_url
@@ -18,73 +18,13 @@ Change-Id: I7af4cf8257f2bdbc7d3cc57930fd6371571db531
 Conflicts:
 	nova/spec/classes/nova_vnc_proxy_spec.rb
 ---
- manifests/vncproxy/common.pp             | 54 ++++++++++++++++++++++++++++++++
  nova/manifests/compute.pp                | 10 ++----
  nova/manifests/vncproxy.pp               | 25 ++++++++++-----
+ nova/manifests/vncproxy/common.pp        | 54 ++++++++++++++++++++++++++++++++
  nova/spec/classes/nova_vnc_proxy_spec.rb |  1 +
  4 files changed, 75 insertions(+), 15 deletions(-)
- create mode 100644 manifests/vncproxy/common.pp
+ create mode 100644 nova/manifests/vncproxy/common.pp
 
-diff --git a/manifests/vncproxy/common.pp b/manifests/vncproxy/common.pp
-new file mode 100644
-index 0000000..15b4633
---- /dev/null
-+++ b/manifests/vncproxy/common.pp
-@@ -0,0 +1,54 @@
-+# == 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;
-+    }
-+  }
-+}
 diff --git a/nova/manifests/compute.pp b/nova/manifests/compute.pp
 index d4eb0f6..6694032 100644
 --- a/nova/manifests/compute.pp
@@ -161,6 +101,66 @@ index b131aac..f2ae993 100644
    if ! defined(Package['python-numpy']) {
      package { 'python-numpy':
        ensure => present,
+diff --git a/nova/manifests/vncproxy/common.pp b/nova/manifests/vncproxy/common.pp
+new file mode 100644
+index 0000000..15b4633
+--- /dev/null
++++ b/nova/manifests/vncproxy/common.pp
+@@ -0,0 +1,54 @@
++# == 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;
++    }
++  }
++}
 diff --git a/nova/spec/classes/nova_vnc_proxy_spec.rb b/nova/spec/classes/nova_vnc_proxy_spec.rb
 index b96415b..0b12686 100644
 --- a/nova/spec/classes/nova_vnc_proxy_spec.rb
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/openstack-puppet-modules.git/commit/?h=f22&id=0500ea2497f924559055375794bce1fae60f0c4f