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:
parent
89ddfeb424
commit
40d75b0859
|
@ -12,12 +12,13 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
#
|
#
|
||||||
|
prepare_network_config(hiera('network_scheme', {}))
|
||||||
|
$mgmt_address = get_network_role_property('management', 'ipaddr')
|
||||||
$lma_collector = hiera_hash('lma_collector')
|
$lma_collector = hiera_hash('lma_collector')
|
||||||
$roles = node_roles(hiera('nodes'), hiera('uid'))
|
$roles = node_roles(hiera('nodes'), hiera('uid'))
|
||||||
$is_controller = member($roles, 'controller') or member($roles, 'primary-controller')
|
$is_controller = member($roles, 'controller') or member($roles, 'primary-controller')
|
||||||
|
|
||||||
$aggregator_address = hiera('management_vip')
|
$aggregator_address = hiera('management_vip')
|
||||||
$internal_address = hiera('internal_address')
|
|
||||||
$management_network = hiera('management_network_range')
|
$management_network = hiera('management_network_range')
|
||||||
$aggregator_port = 5565
|
$aggregator_port = 5565
|
||||||
$check_port = 5566
|
$check_port = 5566
|
||||||
|
@ -29,7 +30,7 @@ class { 'lma_collector::aggregator::client':
|
||||||
|
|
||||||
if $is_controller {
|
if $is_controller {
|
||||||
class { 'lma_collector::aggregator::server':
|
class { 'lma_collector::aggregator::server':
|
||||||
listen_address => $internal_address,
|
listen_address => $mgmt_address,
|
||||||
listen_port => $aggregator_port,
|
listen_port => $aggregator_port,
|
||||||
http_check_port => $check_port,
|
http_check_port => $check_port,
|
||||||
}
|
}
|
||||||
|
@ -54,7 +55,7 @@ if $is_controller {
|
||||||
internal_virtual_ip => $aggregator_address,
|
internal_virtual_ip => $aggregator_address,
|
||||||
public => false,
|
public => false,
|
||||||
public_virtual_ip => undef,
|
public_virtual_ip => undef,
|
||||||
ipaddresses => [ $internal_address ],
|
ipaddresses => [ $mgmt_address ],
|
||||||
server_names => [ $::hostname ],
|
server_names => [ $::hostname ],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -62,7 +63,7 @@ if $is_controller {
|
||||||
firewall { '998 lma':
|
firewall { '998 lma':
|
||||||
port => [$aggregator_port, $check_port],
|
port => [$aggregator_port, $check_port],
|
||||||
source => $management_network,
|
source => $management_network,
|
||||||
destination => $internal_address,
|
destination => $mgmt_address,
|
||||||
proto => 'tcp',
|
proto => 'tcp',
|
||||||
action => 'accept',
|
action => 'accept',
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,6 +14,8 @@
|
||||||
#
|
#
|
||||||
# TODO(spasquier): fail if Neutron isn't used
|
# 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')
|
$lma_collector = hiera_hash('lma_collector')
|
||||||
$roles = node_roles(hiera('nodes'), hiera('uid'))
|
$roles = node_roles(hiera('nodes'), hiera('uid'))
|
||||||
$is_controller = member($roles, 'controller') or member($roles, 'primary-controller')
|
$is_controller = member($roles, 'controller') or member($roles, 'primary-controller')
|
||||||
|
@ -76,7 +78,7 @@ if $is_controller{
|
||||||
# Params used by the script.
|
# Params used by the script.
|
||||||
$rabbit = hiera('rabbit')
|
$rabbit = hiera('rabbit')
|
||||||
$rabbitmq_port = hiera('amqp_port', '5673')
|
$rabbitmq_port = hiera('amqp_port', '5673')
|
||||||
$rabbitmq_host = hiera('internal_address')
|
$rabbitmq_host = $messaging_address
|
||||||
$rabbitmq_user = 'nova'
|
$rabbitmq_user = 'nova'
|
||||||
$rabbitmq_password = $rabbit['password']
|
$rabbitmq_password = $rabbit['password']
|
||||||
$wait_delay = 30
|
$wait_delay = 30
|
||||||
|
|
|
@ -12,6 +12,10 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# 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
|
include lma_collector::params
|
||||||
|
|
||||||
$ceilometer = hiera_hash('ceilometer', {})
|
$ceilometer = hiera_hash('ceilometer', {})
|
||||||
|
@ -42,7 +46,7 @@ if hiera('deployment_mode') =~ /^ha_/ {
|
||||||
|
|
||||||
# OpenStack notifications are always useful for indexation and metrics collection
|
# OpenStack notifications are always useful for indexation and metrics collection
|
||||||
class { 'lma_collector::notifications::controller':
|
class { 'lma_collector::notifications::controller':
|
||||||
host => hiera('internal_address'),
|
host => $messaging_address,
|
||||||
port => hiera('amqp_port', '5673'),
|
port => hiera('amqp_port', '5673'),
|
||||||
user => $rabbitmq_user,
|
user => $rabbitmq_user,
|
||||||
password => $rabbit['password'],
|
password => $rabbit['password'],
|
||||||
|
@ -105,7 +109,7 @@ if $lma_collector['influxdb_mode'] != 'disabled' {
|
||||||
keystone_url => "http://${management_vip}:5000/v2.0",
|
keystone_url => "http://${management_vip}:5000/v2.0",
|
||||||
haproxy_socket => $haproxy_socket,
|
haproxy_socket => $haproxy_socket,
|
||||||
ceph_enabled => $ceph_enabled,
|
ceph_enabled => $ceph_enabled,
|
||||||
memcached_host => hiera('internal_address'),
|
memcached_host => $memcache_address,
|
||||||
pacemaker_resources => [
|
pacemaker_resources => [
|
||||||
'vip__public',
|
'vip__public',
|
||||||
'vip__management',
|
'vip__management',
|
||||||
|
|
|
@ -48,10 +48,10 @@ download_packages \
|
||||||
|
|
||||||
|
|
||||||
# Extract dependent manifests from fuel-library
|
# 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}" | \
|
wget -qO- "${FUEL_LIB_TARBALL_URL}" | \
|
||||||
tar -C "${MODULES_DIR}" --strip-components=3 -zxvf - \
|
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 "collectd" "${COLLECTD_TARBALL_URL}"
|
||||||
download_puppet_module "apache" "${APACHE_TARBALL_URL}"
|
download_puppet_module "apache" "${APACHE_TARBALL_URL}"
|
||||||
|
|
Loading…
Reference in New Issue