Commit 6374bd09 authored by David Johnson's avatar David Johnson

Enable neutron notifications in ceilometer.

parent 57c727b0
......@@ -55,7 +55,7 @@ rabbit_userid = ${RABBIT_USER}
rabbit_password = ${RABBIT_PASS}
auth_strategy = keystone
core_plugin = ml2
service_plugins = router
service_plugins = router,metering
allow_overlapping_ips = True
verbose = True
......
......@@ -424,7 +424,7 @@ vncserver_listen = ${MGMTIP}
vncserver_proxyclient_address = ${MGMTIP}
verbose = True
core_plugin = ml2
service_plugins = router
service_plugins = router,metering
allow_overlapping_ips = True
notify_nova_on_port_status_changes = True
notify_nova_on_port_data_changes = True
......@@ -1053,10 +1053,28 @@ os_username = ceilometer
os_tenant_name = service
os_password = ${CEILOMETER_PASS}
[notification]
store_events = true
disable_non_metric_meters = false
EOF
if [ "${OSCODENAME}" = "juno" ]; then
cat <<EOF >> /etc/ceilometer/ceilometer.conf
[publisher]
metering_secret = ${CEILOMETER_SECRET}
EOF
else
cat <<EOF >> /etc/ceilometer/ceilometer.conf
[service_credentials]
os_endpoint_type = internalURL
os_region_name = regionOne
[publisher]
telemetry_secret = ${CEILOMETER_SECRET}
EOF
fi
sed -i -e "s/^\\(.*auth_host.*=.*\\)$/#\1/" /etc/ceilometer/ceilometer.conf
sed -i -e "s/^\\(.*auth_port.*=.*\\)$/#\1/" /etc/ceilometer/ceilometer.conf
......@@ -1071,6 +1089,10 @@ EOF
service ceilometer-alarm-evaluator restart
service ceilometer-alarm-notifier restart
# NB: restart the neutron ceilometer agent too
fqdn = `getfqdn $NETWORKMANAGER`
ssh -o StrictHostKeyChecking=no $fqdn service neutron-metering-agent restart
echo "CEILOMETER_DBPASS=\"${CEILOMETER_DBPASS}\"" >> $SETTINGS
echo "CEILOMETER_PASS=\"${CEILOMETER_PASS}\"" >> $SETTINGS
echo "CEILOMETER_SECRET=\"${CEILOMETER_SECRET}\"" >> $SETTINGS
......
......@@ -39,7 +39,7 @@ EOF
sysctl -p
$APTGETINSTALL neutron-plugin-ml2 neutron-plugin-openvswitch-agent \
neutron-l3-agent neutron-dhcp-agent conntrack
neutron-l3-agent neutron-dhcp-agent conntrack neutron-metering-agent
sed -i -e "s/^\\(.*connection.*=.*\\)$/#\1/" /etc/neutron/neutron.conf
sed -i -e "s/^\\(.*auth_host.*=.*\\)$/#\1/" /etc/neutron/neutron.conf
......@@ -55,9 +55,10 @@ rabbit_userid = ${RABBIT_USER}
rabbit_password = ${RABBIT_PASS}
auth_strategy = keystone
core_plugin = ml2
service_plugins = router
service_plugins = router,metering
allow_overlapping_ips = True
verbose = True
notification_driver = messagingv2
[keystone_authtoken]
auth_uri = http://$CONTROLLER:5000/v2.0
......@@ -147,11 +148,22 @@ cat <<EOF >> /etc/neutron/metadata_agent.ini
verbose = True
EOF
cat <<EOF >> /etc/neutron/metering_agent.ini
[DEFAULT]
debug = True
driver = neutron.services.metering.drivers.iptables.iptables_driver.IptablesMeteringDriver
measure_interval = 30
report_interval = 300
interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
use_namespaces = True
EOF
service openvswitch-switch restart
service neutron-plugin-openvswitch-agent restart
service neutron-l3-agent restart
service neutron-dhcp-agent restart
service neutron-metadata-agent restart
service neutron-metering-agent restart
touch $OURDIR/setup-networkmanager-done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment