Add support for Sahara logs and notifications
Closes-Bug: #1493699 Change-Id: If3d7688d5f60d38ab21ba44de57b5cfdb4b7adc3
This commit is contained in:
parent
967833c885
commit
e2beeaeef8
|
@ -25,6 +25,7 @@ $rabbit = hiera_hash('rabbit')
|
||||||
$management_vip = hiera('management_vip')
|
$management_vip = hiera('management_vip')
|
||||||
$storage_options = hiera_hash('storage', {})
|
$storage_options = hiera_hash('storage', {})
|
||||||
$murano = hiera_hash('murano')
|
$murano = hiera_hash('murano')
|
||||||
|
$sahara = hiera_hash('sahara')
|
||||||
$contrail = hiera('contrail', false)
|
$contrail = hiera('contrail', false)
|
||||||
|
|
||||||
if $ceilometer['enabled'] {
|
if $ceilometer['enabled'] {
|
||||||
|
@ -56,6 +57,31 @@ class { 'lma_collector::notifications::input':
|
||||||
password => $rabbit['password'],
|
password => $rabbit['password'],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Sahara notifications
|
||||||
|
if $sahara['enabled'] {
|
||||||
|
include sahara::params
|
||||||
|
$sahara_api_service = $::sahara::params::api_service_name
|
||||||
|
$sahara_engine_service = $::sahara::params::engine_service_name
|
||||||
|
|
||||||
|
sahara_config { 'DEFAULT/enable_notifications':
|
||||||
|
value => true,
|
||||||
|
notify => Service[$sahara_api_service, $sahara_engine_service],
|
||||||
|
}
|
||||||
|
sahara_config { 'DEFAULT/notification_topics':
|
||||||
|
value => $notification_topics,
|
||||||
|
notify => Service[$sahara_api_service, $sahara_engine_service],
|
||||||
|
}
|
||||||
|
sahara_config { 'DEFAULT/notification_driver':
|
||||||
|
value => 'messaging',
|
||||||
|
notify => Service[$sahara_api_service, $sahara_engine_service],
|
||||||
|
}
|
||||||
|
|
||||||
|
service { [$sahara_api_service, $sahara_engine_service]:
|
||||||
|
hasstatus => true,
|
||||||
|
hasrestart => true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
# Nova notifications
|
# Nova notifications
|
||||||
include nova::params
|
include nova::params
|
||||||
$nova_api_service = $::nova::params::api_service_name
|
$nova_api_service = $::nova::params::api_service_name
|
||||||
|
@ -222,9 +248,15 @@ lma_collector::logs::openstack { 'heat': }
|
||||||
lma_collector::logs::openstack { 'keystone': }
|
lma_collector::logs::openstack { 'keystone': }
|
||||||
class {'lma_collector::logs::keystone_wsgi': }
|
class {'lma_collector::logs::keystone_wsgi': }
|
||||||
lma_collector::logs::openstack { 'horizon': }
|
lma_collector::logs::openstack { 'horizon': }
|
||||||
|
|
||||||
if $murano['enabled'] {
|
if $murano['enabled'] {
|
||||||
lma_collector::logs::openstack { 'murano': }
|
lma_collector::logs::openstack { 'murano': }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $sahara['enabled'] {
|
||||||
|
lma_collector::logs::openstack { 'sahara': }
|
||||||
|
}
|
||||||
|
|
||||||
if ! $storage_options['objects_ceph'] {
|
if ! $storage_options['objects_ceph'] {
|
||||||
class { 'lma_collector::logs::swift':
|
class { 'lma_collector::logs::swift':
|
||||||
file_match => 'swift-all\.log\.?(?P<Seq>\d*)$',
|
file_match => 'swift-all\.log\.?(?P<Seq>\d*)$',
|
||||||
|
|
|
@ -47,6 +47,8 @@ local logger_map = {
|
||||||
port = 'neutron',
|
port = 'neutron',
|
||||||
router = 'neutron',
|
router = 'neutron',
|
||||||
subnet = 'neutron',
|
subnet = 'neutron',
|
||||||
|
-- sahara
|
||||||
|
sahara = 'sahara',
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Mapping table between the attributes in the notification's payload and the
|
-- Mapping table between the attributes in the notification's payload and the
|
||||||
|
|
|
@ -18,6 +18,7 @@ HEAT_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-heat-7.0.0.
|
||||||
KEYSTONE_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-keystone-7.0.0.tar.gz"
|
KEYSTONE_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-keystone-7.0.0.tar.gz"
|
||||||
NEUTRON_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-neutron-7.0.0.tar.gz"
|
NEUTRON_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-neutron-7.0.0.tar.gz"
|
||||||
NOVA_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-nova-7.0.0.tar.gz"
|
NOVA_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-nova-7.0.0.tar.gz"
|
||||||
|
SAHARA_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-sahara-7.0.0.tar.gz"
|
||||||
OPENSTACKLIB_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-openstacklib-7.0.0.tar.gz"
|
OPENSTACKLIB_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/openstack-openstacklib-7.0.0.tar.gz"
|
||||||
|
|
||||||
download_packages \
|
download_packages \
|
||||||
|
@ -66,4 +67,5 @@ download_puppet_module "heat" "${HEAT_TARBALL_URL}"
|
||||||
download_puppet_module "keystone" "${KEYSTONE_TARBALL_URL}"
|
download_puppet_module "keystone" "${KEYSTONE_TARBALL_URL}"
|
||||||
download_puppet_module "neutron" "${NEUTRON_TARBALL_URL}"
|
download_puppet_module "neutron" "${NEUTRON_TARBALL_URL}"
|
||||||
download_puppet_module "nova" "${NOVA_TARBALL_URL}"
|
download_puppet_module "nova" "${NOVA_TARBALL_URL}"
|
||||||
|
download_puppet_module "sahara" "${SAHARA_TARBALL_URL}"
|
||||||
download_puppet_module "openstacklib" "${OPENSTACKLIB_TARBALL_URL}"
|
download_puppet_module "openstacklib" "${OPENSTACKLIB_TARBALL_URL}"
|
||||||
|
|
Loading…
Reference in New Issue