openstack
/
puppet-neutron
Code Issues Proposed changes

Fix backward compatibility for some parameters 

Since puppet-neutron was partially switched to $::os_service_default fact,
some backward incompatible changes were introduced. This patch makes them
compatible

Change-Id: Ic14f723fe6b7dee01bed1d8234aa8c79ecf9f410
This commit is contained in:
Sergey Kolekonov 2015-12-11 14:20:24 +03:00
parent 965cd4c8ae
commit a5083ca71f
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/init.pp
View File

@ -336,14 +336,16 @@ class neutron (
fail('The ca_file parameter requires that use_ssl to be set to true')
}
if ! is_service_default($kombu_ssl_ca_certs) and !$rabbit_use_ssl {
fail('The kombu_ssl_ca_certs parameter requires rabbit_use_ssl to be set to true')
}
if ! is_service_default($kombu_ssl_certfile) and !$rabbit_use_ssl {
fail('The kombu_ssl_certfile parameter requires rabbit_use_ssl to be set to true')
}
if ! is_service_default($kombu_ssl_keyfile) and !$rabbit_use_ssl {
fail('The kombu_ssl_keyfile parameter requires rabbit_use_ssl to be set to true')
if !$rabbit_use_ssl {
if ! is_service_default($kombu_ssl_ca_certs) and ($kombu_ssl_ca_certs) {
fail('The kombu_ssl_ca_certs parameter requires rabbit_use_ssl to be set to true')
}
if ! is_service_default($kombu_ssl_certfile) and ($kombu_ssl_certfile) {
fail('The kombu_ssl_certfile parameter requires rabbit_use_ssl to be set to true')
}
if ! is_service_default($kombu_ssl_keyfile) and ($kombu_ssl_keyfile) {
fail('The kombu_ssl_keyfile parameter requires rabbit_use_ssl to be set to true')
}
}
if (is_service_default($kombu_ssl_certfile) and ! is_service_default($kombu_ssl_keyfile)) or (is_service_default($kombu_ssl_keyfile) and ! is_service_default($kombu_ssl_certfile)) {
fail('The kombu_ssl_certfile and kombu_ssl_keyfile parameters must be used together')
@ -410,7 +412,7 @@ class neutron (
}
}
if ! is_service_default ($service_plugins) {
if ! is_service_default ($service_plugins) and ($service_plugins) {
if is_array($service_plugins) {
neutron_config { 'DEFAULT/service_plugins': value => join($service_plugins, ',') }
} else {

12
manifests/server/notifications.pp
View File

@ -161,8 +161,10 @@ class neutron::server::notifications (
}
if ! is_service_default ($nova_admin_tenant_id) {
neutron_config {
'DEFAULT/nova_admin_tenant_id': value => $nova_admin_tenant_id;
if $nova_admin_tenant_id {
neutron_config {
'DEFAULT/nova_admin_tenant_id': value => $nova_admin_tenant_id;
}
}
} else {
neutron_config {
@ -183,8 +185,10 @@ class neutron::server::notifications (
'nova/region_name': value => $region_name;
}
if ! is_service_default ($tenant_id) {
neutron_config {
'nova/tenant_id': value => $tenant_id;
if $tenant_id {
neutron_config {
'nova/tenant_id': value => $tenant_id;
}
}
} else {
neutron_config {