x/packstack
Code Issues Proposed changes

reflect puppet-nova changes for novncproxy_base_url

Browse Source 
This changes makes packstack compatible with the changes introduced in
<https://review.openstack.org/168545>.  This is update to
<https://review.openstack.org/#/c/168547>, which was merged before the
puppet-nova changes were finalized.

Resolves: rhbz#1204482
Related-bug: 1436969
Change-Id: Ia8b9ec9d225a11c81b702885c7d4bf369ab31386
This commit is contained in:
Lars Kellogg-Stedman 2015-03-30 15:14:06 -04:00
parent b576673fb8
commit 3e0d51396c
4 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packstack/puppet/templates/nova_common_qpid.pp
View File

@ -1,4 +1,3 @@
$private_key = {
type => hiera('NOVA_MIGRATION_KEY_TYPE'),
key => hiera('NOVA_MIGRATION_KEY_SECRET'),
@ -9,14 +8,6 @@ $public_key = {
}
$nova_common_qpid_cfg_storage_host = hiera('CONFIG_STORAGE_HOST')
$config_horizon_ssl = hiera('CONFIG_HORIZON_SSL')
$vncproxy_protocol = $config_horizon_ssl ? {
true => 'https',
false => 'http',
default => 'http',
}
class { 'nova':
glance_api_servers => "${nova_common_qpid_cfg_storage_host}:9292",
@ -30,6 +21,4 @@ class { 'nova':
debug => hiera('CONFIG_DEBUG_MODE'),
nova_public_key => $public_key,
nova_private_key => $private_key,
vncproxy_host => hiera('CONFIG_CONTROLLER_HOST'),
vncproxy_protocol => $vncproxy_protocol,
}

10
packstack/puppet/templates/nova_common_rabbitmq.pp
View File

@ -1,4 +1,3 @@
$private_key = {
type => hiera('NOVA_MIGRATION_KEY_TYPE'),
key => hiera('NOVA_MIGRATION_KEY_SECRET'),
@ -9,13 +8,6 @@ $public_key = {
}
$nova_common_rabbitmq_cfg_storage_host = hiera('CONFIG_STORAGE_HOST')
$config_horizon_ssl = hiera('CONFIG_HORIZON_SSL')
$vncproxy_protocol = $config_horizon_ssl ? {
true => 'https',
false => 'http',
default => 'http',
}
class { 'nova':
glance_api_servers => "${nova_common_rabbitmq_cfg_storage_host}:9292",
@ -28,6 +20,4 @@ class { 'nova':
debug => hiera('CONFIG_DEBUG_MODE'),
nova_public_key => $public_key,
nova_private_key => $private_key,
vncproxy_host => hiera('CONFIG_CONTROLLER_HOST'),
vncproxy_protocol => $vncproxy_protocol,
}

14
packstack/puppet/templates/nova_compute.pp
View File

@ -27,6 +27,18 @@ nova_config{
value => hiera('CONFIG_NOVA_COMPUTE_MIGRATE_URL');
}
if $is_horizon_ssl == undef {
$is_horizon_ssl = hiera('CONFIG_HORIZON_SSL')
}
if $vncproxy_protocol == undef {
$vncproxy_protocol = $is_horizon_ssl ? {
true => 'https',
false => 'http',
default => 'http',
}
}
if ($::fqdn == '' or $::fqdn =~ /localhost/) {
# For cases where FQDNs have not been correctly set
$vncproxy_server = choose_my_ip(hiera('HOST_LIST'))
@ -36,6 +48,8 @@ if ($::fqdn == '' or $::fqdn =~ /localhost/) {
class { 'nova::compute':
enabled => true,
vncproxy_host => hiera('CONFIG_CONTROLLER_HOST'),
vncproxy_protocol => $vncproxy_protocol,
vncserver_proxyclient_address => $vncproxy_server,
compute_manager => hiera('CONFIG_NOVA_COMPUTE_MANAGER'),
}

16
packstack/puppet/templates/nova_vncproxy.pp
View File

@ -1,6 +1,8 @@
$is_using_ssl_on_horizon = hiera('CONFIG_HORIZON_SSL')
if $is_horizon_ssl == undef {
$is_horizon_ssl = hiera('CONFIG_HORIZON_SSL')
}
if $is_using_ssl_on_horizon == true {
if $is_horizon_ssl == true {
nova_config {
'DEFAULT/ssl_only': value => true;
'DEFAULT/cert': value => '/etc/nova/nova.crt';
@ -8,8 +10,18 @@ if $is_using_ssl_on_horizon == true {
}
}
if $vncproxy_protocol == undef {
$vncproxy_protocol = $is_horizon_ssl ? {
true => 'https',
false => 'http',
default => 'http',
}
}
class { 'nova::vncproxy':
enabled => true,
host => hiera('CONFIG_CONTROLLER_HOST'),
vncproxy_protocol => $vncproxy_protocol,
}
class { 'nova::consoleauth':