diff --git a/manifests/api.pp b/manifests/api.pp index f970a799..f221d0c9 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -7,6 +7,7 @@ class cinder::api ( $keystone_auth_host = 'localhost', $keystone_auth_port = '35357', $keystone_auth_protocol = 'http', + $service_port = '5000', $package_ensure = 'latest', $bind_host = '0.0.0.0', $enabled = true @@ -52,7 +53,7 @@ class cinder::api ( cinder_api_paste_ini { 'filter:authtoken/service_protocol': value => $keystone_auth_protocol; 'filter:authtoken/service_host': value => $keystone_auth_host; - 'filter:authtoken/service_port': value => '5000'; + 'filter:authtoken/service_port': value => $service_port; 'filter:authtoken/auth_protocol': value => $keystone_auth_protocol; 'filter:authtoken/auth_host': value => $keystone_auth_host; 'filter:authtoken/auth_port': value => $keystone_auth_port; diff --git a/manifests/base.pp b/manifests/base.pp index 01e2acac..deff829a 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -11,6 +11,7 @@ class cinder::base ( $rabbit_virtual_host = '/', $rabbit_userid = 'nova', $package_ensure = 'present', + $api_paste_config = '/etc/cinder/api-paste.ini', $verbose = 'False' ) { @@ -50,7 +51,7 @@ class cinder::base ( 'DEFAULT/rabbit_userid': value => $rabbit_userid; 'DEFAULT/sql_connection': value => $sql_connection; 'DEFAULT/verbose': value => $verbose; - 'DEFAULT/api_paste_config': value => '/etc/cinder/api-paste.ini'; + 'DEFAULT/api_paste_config': value => $api_paste_config; } }