From f0c38c7d2b7e570a94fb79a9ee4d249966c8fb68 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 7 Aug 2017 09:50:56 +0800 Subject: [PATCH] Fix rpc_backend option warning The value of rpc_backend option is undef, not $::os_service_default. so fix the if statement condition. Depends-On: I0dfb18d9a32ffecf4608036c174fef1adab73e08 Change-Id: I04f3a9e1e596d9182d40bae2bdb7c2ed4836f317 --- manifests/init.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index bf84f81a..d58b6536 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -307,7 +307,7 @@ # # [*rpc_backend*] # (Optional) DEPRECATED. Use these options to configure the RabbitMQ message system. -# Defaults to 'rabbit' +# Defaults to undef # class cinder ( $database_connection = undef, @@ -378,7 +378,7 @@ class cinder ( $rabbit_userid = $::os_service_default, $rabbit_virtual_host = $::os_service_default, $host = $::os_service_default, - $rpc_backend = 'rabbit', + $rpc_backend = undef, ) inherits cinder::params { include ::cinder::deps @@ -402,7 +402,7 @@ class cinder ( !is_service_default($rabbit_password) or !is_service_default($rabbit_port) or !is_service_default($rabbit_userid) or - !is_service_default($rpc_backend) or + $rpc_backend or !is_service_default($rabbit_virtual_host) { warning("cinder::rabbit_host, cinder::rabbit_hosts, cinder::rabbit_password, \ cinder::rabbit_port, cinder::rabbit_userid, cinder::rabbit_virtual_host and \