openstack/fuel-library
Code Issues Proposed changes

Merge "Configure neutron notifications from network class"

Browse Source
This commit is contained in:
Jenkins 2015-03-13 14:04:13 +00:00 committed by Gerrit Code Review
commit c09e9be069
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/puppet/openstack/manifests/ceilometer.pp
View File

@ -29,7 +29,6 @@ class openstack::ceilometer (
$on_compute = false, $on_compute = false,
$ha_mode = false, $ha_mode = false,
$primary_controller = false, $primary_controller = false,
$use_neutron = false,
$ext_mongo = false, $ext_mongo = false,
# ttl is 1 week (3600*24*7) # ttl is 1 week (3600*24*7)
$time_to_live = '604800', $time_to_live = '604800',
@ -121,10 +120,6 @@ class openstack::ceilometer (
store_events => true, store_events => true,
} }
if $use_neutron {
neutron_config { 'DEFAULT/notification_driver': value => 'messaging' }
}
if $ha_mode { if $ha_mode {
include ceilometer_ha::agent::central include ceilometer_ha::agent::central

1
deployment/puppet/openstack/manifests/controller.pp
View File

@ -383,7 +383,6 @@ class openstack::controller (
ha_mode => $ha_mode, ha_mode => $ha_mode,
primary_controller => $primary_controller, primary_controller => $primary_controller,
on_controller => true, on_controller => true,
use_neutron => $network_provider ? {'nova' => false, 'neutron' => true},
ext_mongo => $ceilometer_ext_mongo, ext_mongo => $ceilometer_ext_mongo,
mongo_replicaset => $mongo_replicaset, mongo_replicaset => $mongo_replicaset,
} }

7
deployment/puppet/openstack/manifests/network.pp
View File

@ -66,6 +66,9 @@ class openstack::network (
$region = 'RegionOne', $region = 'RegionOne',
$neutron_url = 'http://127.0.0.1:9696', $neutron_url = 'http://127.0.0.1:9696',
# Ceilometer notifications
$ceilometer = false,
# Nova settings # Nova settings
$private_interface, $private_interface,
$public_interface, $public_interface,
@ -224,6 +227,10 @@ class openstack::network (
neutron_config { 'DEFAULT/use_syslog_rfc_format': value => true; } neutron_config { 'DEFAULT/use_syslog_rfc_format': value => true; }
} }
if $ceilometer {
neutron_config { 'DEFAULT/notification_driver': value => 'messaging' }
}
if $agents { if $agents {
class {'openstack::network::neutron_agents': class {'openstack::network::neutron_agents':
agents => $agents, agents => $agents,

4
deployment/puppet/osnailyfacter/modular/openstack-network/openstack-network-controller.pp
View File

@ -11,6 +11,7 @@ $rabbit_hash = hiera('rabbit_hash', {})
$internal_address = hiera('internal_address') $internal_address = hiera('internal_address')
$service_endpoint = hiera('management_vip') $service_endpoint = hiera('management_vip')
$nova_hash = hiera('nova', {}) $nova_hash = hiera('nova', {})
$ceilometer_hash = hiera('ceilometer',{})
$floating_hash = {} $floating_hash = {}
@ -218,6 +219,9 @@ class { 'openstack::network':
auth_url => "http://${service_endpoint}:35357/v2.0", auth_url => "http://${service_endpoint}:35357/v2.0",
neutron_url => "http://${service_endpoint}:9696", neutron_url => "http://${service_endpoint}:9696",
# Ceilometer notifications
ceilometer => $ceilometer_hash['enabled'],
#metadata #metadata
shared_secret => $neutron_metadata_proxy_secret, shared_secret => $neutron_metadata_proxy_secret,
metadata_ip => $service_endpoint, metadata_ip => $service_endpoint,