summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarios <marios@redhat.com>2015-06-18 12:21:29 +0300
committerGiulio Fidente <gfidente@redhat.com>2015-06-18 14:31:52 +0200
commitd02beabc0af6b4843f7b4bbd759f1ba4252562b8 (patch)
tree90b8ea3c07fa5921a9a4adcb7c977f5a2fb033fa
parent63af3fcbe90158ce1a3f96d35219805d902c25f4 (diff)
Enable loadbalancing of the Redis VIP, defaults to False
We have to set it to true as the default is false which means the redis vip can't be reached. This was manifested as a problem with ceilometer agent reaching the coordination url like [1]. Co-Authored-By: Giulio Fidente <gfidente@redhat.com> [1] https://bugzilla.redhat.com/attachment.cgi?id=1040023 Closes-Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1232797 Change-Id: I1cd63308d0ac1d17542e1a2a909ee1a9680ed4b3
-rw-r--r--environments/puppet-pacemaker.yaml3
-rw-r--r--puppet/controller-puppet.yaml7
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp3
-rw-r--r--puppet/vip-config.yaml1
4 files changed, 8 insertions, 6 deletions
diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml
index 70e1b3ed..f235cf8f 100644
--- a/environments/puppet-pacemaker.yaml
+++ b/environments/puppet-pacemaker.yaml
@@ -2,6 +2,3 @@
# Overcloud controller with Pacemaker.
resource_registry:
OS::TripleO::ControllerConfig: ../puppet/controller-config-pacemaker.yaml
-
-parameter_defaults:
- RedisVirtualIP: 192.0.2.142
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 67a11f00..7969e9c7 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -691,6 +691,12 @@ resources:
ceilometer_backend: {get_param: CeilometerBackend}
ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
ceilometer_password: {get_param: CeilometerPassword}
+ ceilometer_coordination_url:
+ list_join:
+ - ''
+ - - 'redis://'
+ - {get_param: RedisVirtualIP}
+ - ':6379'
ceilometer_dsn:
list_join:
- ''
@@ -949,6 +955,7 @@ resources:
ceilometer::api::keystone_identity_uri: {get_input: keystone_identity_uri}
ceilometer::agent::auth::auth_password: {get_input: ceilometer_password}
ceilometer::agent::auth::auth_url: {get_input: keystone_auth_address}
+ ceilometer::agent::central::coordination_url: {get_input: ceilometer_coordination_url}
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 4ef395f2..de9eac51 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -55,7 +55,7 @@ if hiera('step') >= 1 {
class { '::tripleo::loadbalancer' :
controller_hosts => $controller_node_ips,
controller_hosts_names => $controller_node_names,
- redis => false,
+ redis => true,
manage_vip => false,
haproxy_service_manage => false,
}
@@ -674,7 +674,6 @@ if hiera('step') >= 3 {
class { '::ceilometer::agent::central' :
manage_service => false,
enabled => false,
- coordination_url => "redis://${redis_vip}:6379",
}
class { '::ceilometer::alarm::notifier' :
manage_service => false,
diff --git a/puppet/vip-config.yaml b/puppet/vip-config.yaml
index c083821e..1dec489c 100644
--- a/puppet/vip-config.yaml
+++ b/puppet/vip-config.yaml
@@ -27,7 +27,6 @@ resources:
horizon_vip: {get_input: horizon_vip}
redis_vip: {get_input: redis_vip}
mysql_vip: {get_input: mysql_vip}
- mysql_vip: {get_input: mysql_vip}
tripleo::loadbalancer::public_virtual_ip: {get_input: public_virtual_ip}
tripleo::loadbalancer::controller_virtual_ip: {get_input: control_virtual_ip}
tripleo::loadbalancer::internal_api_virtual_ip: {get_input: internal_api_virtual_ip}