diff --git a/manifests/volume.pp b/manifests/volume.pp index abfc5b44..15c65c25 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -65,17 +65,17 @@ # Defaults value in params # class cloud::volume( - $cinder_db_host = $os_params::cinder_db_host, - $cinder_db_user = $os_params::cinder_db_user, - $cinder_db_password = $os_params::cinder_db_password, - $rabbit_hosts = $os_params::rabbit_hosts, - $rabbit_password = $os_params::rabbit_password, - $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, - $ks_cinder_password = $os_params::ks_cinder_password, - $verbose = $os_params::verbose, - $debug = $os_params::debug, - $log_facility = $os_params::log_facility, - $use_syslog = $os_params::use_syslog + $cinder_db_host = '127.0.0.1', + $cinder_db_user = 'cinder', + $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', + $use_syslog = true ) { # Disable twice logging if syslog is enabled diff --git a/manifests/volume/controller.pp b/manifests/volume/controller.pp index a428b3bd..0cdb2ec7 100644 --- a/manifests/volume/controller.pp +++ b/manifests/volume/controller.pp @@ -17,12 +17,12 @@ # class cloud::volume::controller( - $ks_cinder_internal_port = $os_params::ks_cinder_internal_port, - $ks_cinder_password = $os_params::ks_cinder_password, - $ks_keystone_internal_host = $os_params::ks_keystone_internal_host, - $ks_glance_internal_host = $os_params::ks_glance_internal_host, - $ks_glance_api_internal_port = $os_params::ks_glance_api_internal_port, - $api_eth = $os_params::api_eth, + $ks_cinder_internal_port = 8776, + $ks_cinder_password = 'cinderpassword', + $ks_keystone_internal_host = '127.0.0.1', + $ks_glance_internal_host = '127.0.0.1', + $ks_glance_api_internal_port = 9292, + $api_eth = '127.0.0.1', # Maintain backward compatibility for multi-backend $volume_multi_backend = false, $default_volume_type = undef, diff --git a/manifests/volume/storage.pp b/manifests/volume/storage.pp index fd2431a7..60a9074b 100644 --- a/manifests/volume/storage.pp +++ b/manifests/volume/storage.pp @@ -55,14 +55,14 @@ class cloud::volume::storage( $ks_keystone_internal_port = '5000', $ks_keystone_internal_host = '127.0.0.1', $ks_cinder_password = 'secrete', - # Deprecated parameters - $glance_api_version = '2', - $cinder_rbd_pool = $os_params::cinder_rbd_pool, - $cinder_rbd_user = $os_params::cinder_rbd_user, - $cinder_rbd_secret_uuid = $os_params::ceph_fsid, + $cinder_rbd_pool = 'volumes', + $cinder_rbd_user = 'cinder', + $cinder_rbd_secret_uuid = '4a158d27-f750-41d5-9e7f-26ce4c9d2d45', $cinder_rbd_conf = '/etc/ceph/ceph.conf', $cinder_rbd_flatten_volume_from_snapshot = false, - $cinder_rbd_max_clone_depth = '5' + $cinder_rbd_max_clone_depth = '5', + # Deprecated parameters + $glance_api_version = '2', ) { include 'cloud::volume'