openstack/puppet-nova
Code Issues Proposed changes

Merge "Remove Unknown variable warnings"

Browse Source
This commit is contained in:
Zuul 2019-06-13 21:47:12 +00:00 committed by Gerrit Code Review
commit 6ba4a0029e
1 changed files with 62 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
manifests/vncproxy/common.pp
View File

@ -25,25 +25,76 @@ class nova::vncproxy::common (
include ::nova::deps include ::nova::deps
$vncproxy_host_real = normalize_ip_for_uri(pick( if defined('$::nova::compute::vncproxy_host') {
$compute_vncproxy_host_real = $::nova::compute::vncproxy_host
} else {
$compute_vncproxy_host_real = undef
}
if defined('$::nova::vncproxy::host') {
$compat_vncproxy_host_real = $::nova::vncproxy::host
} else {
$compat_vncproxy_host_real = undef
}
$vncproxy_host_real = normalize_ip_for_uri(pick(
$vncproxy_host, $vncproxy_host,
$::nova::compute::vncproxy_host, $compute_vncproxy_host_real,
$::nova::vncproxy::host, $compat_vncproxy_host_real,
false)) false))
if defined('$::nova::compute::vncproxy_protocol') {
$compute_vncproxy_protocol_real = $::nova::compute::vncproxy_protocol
} else {
$compute_vncproxy_protocol_real = undef
}
if defined('$::nova::vncproxy::vncproxy_protocol') {
$compat_vncproxy_protocol_real = $::nova::vncproxy::vncproxy_protocol
} else {
$compat_vncproxy_protocol_real = undef
}
$vncproxy_protocol_real = pick( $vncproxy_protocol_real = pick(
$vncproxy_protocol, $vncproxy_protocol,
$::nova::compute::vncproxy_protocol, $compute_vncproxy_protocol_real,
$::nova::vncproxy::vncproxy_protocol, $compat_vncproxy_protocol_real,
'http') 'http')
$vncproxy_port_real = pick(
if defined('$::nova::compute::vncproxy_port') {
$compute_vncproxy_port_real = $::nova::compute::vncproxy_port
} else {
$compute_vncproxy_port_real = undef
}
if defined('$::nova::vncproxy::port') {
$compat_vncproxy_port_real = $::nova::vncproxy::port
} else {
$compat_vncproxy_port_real = undef
}
$vncproxy_port_real = pick(
$vncproxy_port, $vncproxy_port,
$::nova::compute::vncproxy_port, $compute_vncproxy_port_real,
$::nova::vncproxy::port, $compat_vncproxy_port_real,
6080) 6080)
$vncproxy_path_real = pick(
if defined('$::nova::compute::vncproxy_path') {
$compute_vncproxy_path_real = $::nova::compute::vncproxy_path
} else {
$compute_vncproxy_path_real = undef
}
if defined('$::nova::vncproxy::vncproxy_path') {
$compat_vncproxy_path_real = $::nova::vncproxy::vncproxy_path
} else {
$compat_vncproxy_path_real = undef
}
$vncproxy_path_real = pick(
$vncproxy_path, $vncproxy_path,
$::nova::compute::vncproxy_path, $compute_vncproxy_path_real,
$::nova::vncproxy::vncproxy_path, $compat_vncproxy_path_real,
'/vnc_auto.html') '/vnc_auto.html')
if ($vncproxy_host_real) { if ($vncproxy_host_real) {