aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'puppet')
-rw-r--r--puppet/controller-puppet.yaml8
-rw-r--r--puppet/hieradata/controller.yaml1
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp12
-rw-r--r--puppet/vip-config.yaml1
4 files changed, 16 insertions, 6 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index a38a0a3c..3d7ecd58 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}
@@ -972,6 +979,7 @@ resources:
nova::vncproxy::host: {get_input: nova_api_network}
# Horizon
+ apache::ip: {get_input: horizon_network}
horizon::django_debug: {get_input: debug}
horizon::secret_key: {get_input: horizon_secret}
horizon::bind_address: {get_input: horizon_network}
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 99ec0e91..2e30f211 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -114,3 +114,4 @@ tripleo::loadbalancer::ceilometer: true
tripleo::loadbalancer::heat_api: true
tripleo::loadbalancer::heat_cloudwatch: true
tripleo::loadbalancer::heat_cfn: true
+tripleo::loadbalancer::horizon: true
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index f3449798..5c45ed14 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,
}
@@ -675,7 +675,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,
@@ -720,14 +719,17 @@ if hiera('step') >= 3 {
}
# httpd/apache and horizon
+ # NOTE(gfidente): server-status can be consumed by the pacemaker resource agent
include ::apache
- class { '::apache::mod::status':
- allow_from => ['127.0.0.1'],
+ include ::apache::mod::status
+ $vhost_params = {
+ add_listen => false,
+ priority => 10,
}
- $vhost_params = { add_listen => false }
class { 'horizon':
cache_server_ip => hiera('memcache_node_ips', '127.0.0.1'),
vhost_extra_params => $vhost_params,
+ server_aliases => $::hostname,
}
$snmpd_user = hiera('snmpd_readonly_user_name')
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}