From 23ba374a90e244fbf7be3f0f19d38692afd03d8c Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 9 May 2014 00:37:01 +0200 Subject: [PATCH] volume: drop useless parameters --- manifests/volume.pp | 10 ---------- spec/classes/cloud_volume_controller_spec.rb | 2 -- spec/classes/cloud_volume_storage_spec.rb | 2 -- 3 files changed, 14 deletions(-) diff --git a/manifests/volume.pp b/manifests/volume.pp index 697fb7d3..60c7a9ec 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -40,14 +40,6 @@ # (optional) Password to connect to cinder queues. # Defaults to 'rabbitpassword' # -# [*ks_keystone_internal_host*] -# (optional) Keystone host (authentication) -# Defaults to '127.0.0.1' -# -# [*ks_cinder_password*] -# (optional) Keystone password for cinder user. -# Defaults to 'cinderpassword' -# # [*verbose*] # (optional) Set log output to verbose output # Defaults to true @@ -71,8 +63,6 @@ class cloud::volume( $cinder_db_password = 'cinderpassword', $rabbit_hosts = ['127.0.0.1:5672'], $rabbit_password = 'rabbitpassword', - $ks_keystone_internal_host = '127.0.0.1', - $ks_cinder_password = 'cinderpassword', $verbose = true, $debug = true, $log_facility = 'LOG_LOCAL0', diff --git a/spec/classes/cloud_volume_controller_spec.rb b/spec/classes/cloud_volume_controller_spec.rb index fb6b15d1..13f0d315 100644 --- a/spec/classes/cloud_volume_controller_spec.rb +++ b/spec/classes/cloud_volume_controller_spec.rb @@ -29,8 +29,6 @@ describe 'cloud::volume::controller' do cinder_db_password => 'secrete', rabbit_hosts => ['10.0.0.1'], rabbit_password => 'secrete', - ks_keystone_internal_host => '10.0.0.1', - ks_cinder_password => 'secrete', verbose => true, debug => true, log_facility => 'LOG_LOCAL0', diff --git a/spec/classes/cloud_volume_storage_spec.rb b/spec/classes/cloud_volume_storage_spec.rb index 98490a66..01052770 100644 --- a/spec/classes/cloud_volume_storage_spec.rb +++ b/spec/classes/cloud_volume_storage_spec.rb @@ -29,8 +29,6 @@ describe 'cloud::volume::storage' do cinder_db_password => 'secret', rabbit_hosts => ['10.0.0.1'], rabbit_password => 'secret', - ks_keystone_internal_host => '10.0.0.1', - ks_cinder_password => 'secret', verbose => true, debug => true, log_facility => 'LOG_LOCAL0',