diff options
Diffstat (limited to 'manifests/profile/base')
| -rw-r--r-- | manifests/profile/base/ceilometer/collector.pp | 9 | ||||
| -rw-r--r-- | manifests/profile/base/cinder/volume/eqlx.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/pacemaker.pp | 4 | ||||
| -rw-r--r-- | manifests/profile/base/swift/proxy.pp | 1 | ||||
| -rw-r--r-- | manifests/profile/base/swift/ringbuilder.pp | 13 |
5 files changed, 19 insertions, 10 deletions
diff --git a/manifests/profile/base/ceilometer/collector.pp b/manifests/profile/base/ceilometer/collector.pp index 443873f..3c0a361 100644 --- a/manifests/profile/base/ceilometer/collector.pp +++ b/manifests/profile/base/ceilometer/collector.pp @@ -60,10 +60,6 @@ class tripleo::profile::base::ceilometer::collector ( include ::tripleo::profile::base::ceilometer - if $step >= 3 and $sync_db { - include ::ceilometer::db::sync - } - if $step >= 4 or ($step >= 3 and $sync_db) { if downcase($ceilometer_backend) == 'mongodb' { if empty($mongodb_node_ips) { @@ -88,10 +84,13 @@ class tripleo::profile::base::ceilometer::collector ( $ceilometer_mongodb_conn_string = "mongodb://${mongo_node_string}/ceilometer?replicaSet=${mongodb_replset}" class { '::ceilometer::db' : + sync_db => $sync_db, database_connection => $ceilometer_mongodb_conn_string, } } else { - include ::ceilometer::db + class { '::ceilometer::db' : + sync_db => $sync_db, + } } include ::ceilometer::collector include ::ceilometer::dispatcher::gnocchi diff --git a/manifests/profile/base/cinder/volume/eqlx.pp b/manifests/profile/base/cinder/volume/eqlx.pp index 2399459..fe24f4b 100644 --- a/manifests/profile/base/cinder/volume/eqlx.pp +++ b/manifests/profile/base/cinder/volume/eqlx.pp @@ -43,7 +43,7 @@ class tripleo::profile::base::cinder::volume::eqlx ( eqlx_pool => hiera('cinder::backend::eqlx::eqlx_pool', undef), eqlx_use_chap => hiera('cinder::backend::eqlx::eqlx_use_chap', undef), eqlx_chap_login => hiera('cinder::backend::eqlx::eqlx_chap_login', undef), - eqlx_chap_password => hiera('cinder::backend::eqlx::eqlx_san_password', undef), + eqlx_chap_password => hiera('cinder::backend::eqlx::eqlx_chap_password', undef), } } diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp index 43edfaf..cc5fd8a 100644 --- a/manifests/profile/base/pacemaker.pp +++ b/manifests/profile/base/pacemaker.pp @@ -68,10 +68,6 @@ class tripleo::profile::base::pacemaker ( # enable stonith after all fencing devices have been created Class['tripleo::fencing'] -> Class['pacemaker::stonith'] } - - file { '/var/lib/tripleo/pacemaker-restarts': - ensure => directory, - } ~> Tripleo::Pacemaker::Resource_restart_flag<||> } if $step >= 2 { diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp index fc9fe11..8cb1132 100644 --- a/manifests/profile/base/swift/proxy.pp +++ b/manifests/profile/base/swift/proxy.pp @@ -53,5 +53,6 @@ class tripleo::profile::base::swift::proxy ( include ::swift::proxy::formpost include ::swift::proxy::bulk include ::swift::proxy::ceilometer + include ::swift::proxy::versioned_writes } } diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp index c77d744..7e5fc74 100644 --- a/manifests/profile/base/swift/ringbuilder.pp +++ b/manifests/profile/base/swift/ringbuilder.pp @@ -54,6 +54,15 @@ # (Optional) list of ip addresses for nodes running swift_storage service # Defaults to hiera('swift_storage_node_ips') or an empty list # +# [*part_power*] +# (Optional) The total number of partitions that should exist in the ring. +# This is expressed as a power of 2. +# Defaults to undef +# +# [*min_part_hours*] +# Minimum amount of time before partitions can be moved. +# Defaults to undef +# class tripleo::profile::base::swift::ringbuilder ( $replicas, $build_ring = true, @@ -63,6 +72,8 @@ class tripleo::profile::base::swift::ringbuilder ( $raw_disk_prefix = 'r1z1-', $raw_disks = [], $swift_storage_node_ips = hiera('swift_storage_node_ips', []), + $part_power = undef, + $min_part_hours = undef, ) { if $step >= 2 { # pre-install swift here so we can build rings @@ -81,7 +92,9 @@ class tripleo::profile::base::swift::ringbuilder ( # create local rings swift::ringbuilder::create{ ['object', 'account', 'container']: + part_power => $part_power, replicas => min(count($device_array), $replicas), + min_part_hours => $min_part_hours, } -> # add all other devices |