openstack/puppet-nova
Code Issues Proposed changes

Update parameters in nova class

Browse Source 
This commit updates three parameters in the nova class.

- use_deprecated_auth

Previously, this was always set to be true. This commit updates
the config so that this is set to false if auth_type is keystone (and
set to true if it is not)

- glance_host, glance_port

These options have been removed since they had already been replaced with
the glance_api_servers option.
This commit is contained in:
Dan Bode
2012-04-08 22:43:02 +00:00
parent 1cdf7388f8
commit 9ec846779e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/init.pp
View File

@@ -7,8 +7,6 @@ class nova(
# these glance params should be optional # these glance params should be optional
# this should probably just be configured as a glance client # this should probably just be configured as a glance client
$glance_api_servers = 'localhost:9292', $glance_api_servers = 'localhost:9292',
$glance_host = 'localhost',
$glance_port = '9292',
$allow_admin_api = false, $allow_admin_api = false,
$rabbit_host = 'localhost', $rabbit_host = 'localhost',
$rabbit_password='guest', $rabbit_password='guest',
@@ -141,7 +139,6 @@ class nova(
# config b/c they have to be set by both compute # config b/c they have to be set by both compute
# as well as controller. # as well as controller.
'network_manager': value => $network_manager; 'network_manager': value => $network_manager;
'use_deprecated_auth': value => true;
'root_helper': value => $root_helper; 'root_helper': value => $root_helper;
'auth_strategy': value => $auth_strategy; 'auth_strategy': value => $auth_strategy;
} }
@@ -151,6 +148,12 @@ class nova(
refreshonly => true, refreshonly => true,
} }
if $auth_strategy == 'keystone' {
nova_config { 'use_deprecated_auth': value => false }
} else {
nova_config { 'use_deprecated_auth': value => true }
}
if $network_manager == 'nova.network.manager.FlatManager' { if $network_manager == 'nova.network.manager.FlatManager' {
nova_config { nova_config {
'flat_network_bridge': value => $flat_network_bridge 'flat_network_bridge': value => $flat_network_bridge
@@ -167,8 +170,6 @@ class nova(
if $image_service == 'nova.image.glance.GlanceImageService' { if $image_service == 'nova.image.glance.GlanceImageService' {
nova_config { nova_config {
'glance_api_servers': value => $glance_api_servers; 'glance_api_servers': value => $glance_api_servers;
'glance_host': value => $glance_host;
'glance_port': value => $glance_port;
} }
} }
} }