Commit 7aa7ec0e authored by Thomas Goirand's avatar Thomas Goirand

Switch to zookeeper.

parent f655c777
......@@ -309,27 +309,32 @@ export OS_CACERT=/etc/ssl/certs/oci-pki-oci-ca-chain.pem
##############################
# needed for Telemetry / metric / rating
if $has_subrole_gnocchi {
class { 'zookeeper':
client_ip => $machine_ip,
servers => $all_masters,
}
if $is_first_master {
class { '::redis':
bind => $machine_ip,
appendonly => true,
cluster_enabled => true,
cluster_config_file => 'nodes.conf',
cluster_node_timeout => 5000,
}
} else {
class { '::redis':
bind => $machine_ip,
appendonly => true,
cluster_enabled => true,
cluster_config_file => 'nodes.conf',
cluster_node_timeout => 5000,
$all_masters_ip.each |Integer $index, String $value| {
if($machine_ip == $value){
class { 'zookeeper':
id => String($index + 1),
client_ip => $machine_ip,
servers => $all_masters_ip,
}
}
}
# if $is_first_master {
# class { '::redis':
# bind => $machine_ip,
# appendonly => true,
# cluster_enabled => true,
# cluster_config_file => 'nodes.conf',
# cluster_node_timeout => 5000,
# }
# } else {
# class { '::redis':
# bind => $machine_ip,
# appendonly => true,
# cluster_enabled => true,
# cluster_config_file => 'nodes.conf',
# cluster_node_timeout => 5000,
# }
# }
}
::oci::sysctl { 'oci-rox': }
......@@ -2526,7 +2531,8 @@ test -e \$mon_data/done
}
class { '::gnocchi::storage':
metric_processing_delay => 10,
coordination_url => "redis://${first_master_ip}:6379/",
# coordination_url => "redis://${first_master_ip}:6379/",
coordination_url => "zookeeper://${first_master_ip}:2181/",
}
class { '::gnocchi::storage::ceph':
ceph_username => 'openstack',
......@@ -2647,7 +2653,8 @@ test -e \$mon_data/done
event_pipeline_publishers => $event_pipeline_publishers,
}
class { '::ceilometer::agent::central':
coordination_url => "redis://${first_master_ip}:6379/",
# coordination_url => "redis://${first_master_ip}:6379/",
coordination_url => "zookeeper://${first_master_ip}:2181/",
}
class { '::ceilometer::agent::auth':
auth_password => $pass_ceilometer_authtoken,
......@@ -2660,6 +2667,10 @@ test -e \$mon_data/done
# That's each 5 minutes:
polling_interval => 300,
}
# Looks like the above sets ca_file instead of cafile.
ceilometer_config {
'service_credentials/cafile': value => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem';
}
}
########################
### Setup CloudKitty ###
......@@ -2723,9 +2734,10 @@ test -e \$mon_data/done
}
cloudkitty_config {
'keystone_fetcher/cafile': value => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem';
'gnocchi_collector/cafile': value => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem';
'coordination/backend_url': value => "redis://${first_master_ip}:6379/",
'keystone_fetcher/cafile': value => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem';
'gnocchi_collector/cafile': value => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem';
# 'coordination/backend_url': value => "redis://${first_master_ip}:6379/",
'coordination/backend_url': value => "zookeeper://${first_master_ip}:2181/",
}
class { '::cloudkitty::processor': }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment