x
/
fuel-plugin-lma-collector
Code Issues Proposed changes

Replace $internal_address determination logic 

The hiera('internal_address') is no longer available with MOS 8.0, this
change uses the Fuel way to retrieve the management IP address.

Change-Id: I9b25f1b79b59ac9ed52531704bf5e829f23812da
This commit is contained in:
Swann Croiset 2015-11-25 17:35:22 +01:00
parent 89ddfeb424
commit 40d75b0859
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deployment_scripts/puppet/manifests/aggregator.pp
View File

@ -12,12 +12,13 @@
# License for the specific language governing permissions and limitations
# under the License.
#
prepare_network_config(hiera('network_scheme', {}))
$mgmt_address = get_network_role_property('management', 'ipaddr')
$lma_collector = hiera_hash('lma_collector')
$roles = node_roles(hiera('nodes'), hiera('uid'))
$is_controller = member($roles, 'controller') or member($roles, 'primary-controller')
$aggregator_address = hiera('management_vip')
$internal_address = hiera('internal_address')
$management_network = hiera('management_network_range')
$aggregator_port = 5565
$check_port = 5566
@ -29,7 +30,7 @@ class { 'lma_collector::aggregator::client':
if $is_controller {
class { 'lma_collector::aggregator::server':
listen_address => $internal_address,
listen_address => $mgmt_address,
listen_port => $aggregator_port,
http_check_port => $check_port,
}
@ -54,7 +55,7 @@ if $is_controller {
internal_virtual_ip => $aggregator_address,
public => false,
public_virtual_ip => undef,
ipaddresses => [ $internal_address ],
ipaddresses => [ $mgmt_address ],
server_names => [ $::hostname ],
}
@ -62,7 +63,7 @@ if $is_controller {
firewall { '998 lma':
port => [$aggregator_port, $check_port],
source => $management_network,
destination => $internal_address,
destination => $mgmt_address,
proto => 'tcp',
action => 'accept',
}

4
deployment_scripts/puppet/manifests/base.pp
View File

@ -14,6 +14,8 @@
#
# TODO(spasquier): fail if Neutron isn't used
prepare_network_config(hiera('network_scheme', {}))
$messaging_address = get_network_role_property('mgmt/messaging', 'ipaddr')
$lma_collector = hiera_hash('lma_collector')
$roles = node_roles(hiera('nodes'), hiera('uid'))
$is_controller = member($roles, 'controller') or member($roles, 'primary-controller')
@ -76,7 +78,7 @@ if $is_controller{
# Params used by the script.
$rabbit = hiera('rabbit')
$rabbitmq_port = hiera('amqp_port', '5673')
$rabbitmq_host = hiera('internal_address')
$rabbitmq_host = $messaging_address
$rabbitmq_user = 'nova'
$rabbitmq_password = $rabbit['password']
$wait_delay = 30

8
deployment_scripts/puppet/manifests/controller.pp
View File

@ -12,6 +12,10 @@
# License for the specific language governing permissions and limitations
# under the License.
#
prepare_network_config(hiera('network_scheme', {}))
$messaging_address = get_network_role_property('mgmt/messaging', 'ipaddr')
$memcache_address = get_network_role_property('mgmt/memcache', 'ipaddr')
include lma_collector::params
$ceilometer = hiera_hash('ceilometer', {})
@ -42,7 +46,7 @@ if hiera('deployment_mode') =~ /^ha_/ {
# OpenStack notifications are always useful for indexation and metrics collection
class { 'lma_collector::notifications::controller':
host => hiera('internal_address'),
host => $messaging_address,
port => hiera('amqp_port', '5673'),
user => $rabbitmq_user,
password => $rabbit['password'],
@ -105,7 +109,7 @@ if $lma_collector['influxdb_mode'] != 'disabled' {
keystone_url => "http://${management_vip}:5000/v2.0",
haproxy_socket => $haproxy_socket,
ceph_enabled => $ceph_enabled,
memcached_host => hiera('internal_address'),
memcached_host => $memcache_address,
pacemaker_resources => [
'vip__public',
'vip__management',

4
pre_build_hook
View File

@ -48,10 +48,10 @@ download_packages \
# Extract dependent manifests from fuel-library
rm -rf "${MODULES_DIR:?}"/{cinder,glance,haproxy,heat,keystone,neutron,nova,openstack,osnailyfacter,pacemaker}
rm -rf "${MODULES_DIR:?}"/{cinder,glance,haproxy,heat,keystone,neutron,nova,openstack,osnailyfacter,pacemaker,l23network}
wget -qO- "${FUEL_LIB_TARBALL_URL}" | \
tar -C "${MODULES_DIR}" --strip-components=3 -zxvf - \
fuel-library-${FUEL_LIB_COMMIT}/deployment/puppet/{cinder,glance,haproxy,heat,keystone,neutron,nova,openstack,osnailyfacter,pacemaker}
fuel-library-${FUEL_LIB_COMMIT}/deployment/puppet/{cinder,glance,haproxy,heat,keystone,neutron,nova,openstack,osnailyfacter,pacemaker,l23network}
download_puppet_module "collectd" "${COLLECTD_TARBALL_URL}"
download_puppet_module "apache" "${APACHE_TARBALL_URL}"