From d6e7cd9fd95be9b9b8768775156cd90e55e35fa6 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Thu, 19 Sep 2013 12:10:33 +1200 Subject: [PATCH] Move dnsmasq install into appropriate elements. It was conflated with nova-compute, but it's really a networking problem. Change-Id: Ic67f48b55b079ae2ea845dcc19a0275522a9823a --- elements/bm-dnsmasq/install.d/81-bm-dnsmasq | 2 ++ elements/neutron-dhcp-agent/install.d/80-neutron-dhcp-agent | 2 ++ elements/nova-compute/install.d/80-nova-compute | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/elements/bm-dnsmasq/install.d/81-bm-dnsmasq b/elements/bm-dnsmasq/install.d/81-bm-dnsmasq index 2f11fc91b..cffb3c1e9 100755 --- a/elements/bm-dnsmasq/install.d/81-bm-dnsmasq +++ b/elements/bm-dnsmasq/install.d/81-bm-dnsmasq @@ -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] diff --git a/elements/neutron-dhcp-agent/install.d/80-neutron-dhcp-agent b/elements/neutron-dhcp-agent/install.d/80-neutron-dhcp-agent index fb6cede2a..76cab8abe 100755 --- a/elements/neutron-dhcp-agent/install.d/80-neutron-dhcp-agent +++ b/elements/neutron-dhcp-agent/install.d/80-neutron-dhcp-agent @@ -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 diff --git a/elements/nova-compute/install.d/80-nova-compute b/elements/nova-compute/install.d/80-nova-compute index a41649214..0b470fd73 100755 --- a/elements/nova-compute/install.d/80-nova-compute +++ b/elements/nova-compute/install.d/80-nova-compute @@ -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