Move dnsmasq install into appropriate elements.

It was conflated with nova-compute, but it's really a networking
problem.

Change-Id: Ic67f48b55b079ae2ea845dcc19a0275522a9823a
This commit is contained in:
Robert Collins 2013-09-19 12:10:33 +12:00
parent eb6babfca2
commit d6e7cd9fd9
3 changed files with 5 additions and 1 deletions

View File

@ -1,6 +1,8 @@
#!/bin/bash
set -eux
install-packages dnsmasq dnsmasq-utils
function install_dnsmasq_upstart {
cat > /etc/init/nova-bm-dnsmasq.conf << eof
start on runlevel [2345]

View File

@ -1,4 +1,6 @@
#!/bin/bash
set -eux
install-packages dnsmasq dnsmasq-utils
os-svc-daemon -n neutron-dhcp-agent -u neutron -c neutron-dhcp-agent -- --config-file /etc/neutron/dhcp_agent.ini --config-dir /etc/neutron

View File

@ -2,7 +2,7 @@
set -eux
# Used by all compute
install-packages dnsmasq dnsmasq-utils ebtables qemu-utils syslinux
install-packages ebtables qemu-utils syslinux
# LIBVIRT_DEFAULT_URI needs to be set due to
# https://bugs.launchpad.net/tripleo/+bug/1226310