From dd06c2347b4af24a39cc635d58d8599d8e7a6a01 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Sat, 2 May 2015 09:17:12 -0700 Subject: [PATCH] The neutron dockerfile needs an update for Kilo policy.json comes from the openstack-neutron package and is required for the agents to run. So install it. fwaas_driver.ini has been deleted in master and in the kilo branch, but the agents won't run without the file present. So copy one from the Juno release. fwaas_driver.ini is probably not actually required, but there is a configuration problem somewhere in our Neutron code base. We are out of time for the Kilo branch, so this short term workaround should be fine. Change-Id: I154599925308765349634b1a53e598599fc20ec1 Partially-Implements: blueprint port-kilo --- docker/neutron/neutron-agents/Dockerfile | 8 +++++++- docker/neutron/neutron-agents/fwaas_driver.ini | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 docker/neutron/neutron-agents/fwaas_driver.ini diff --git a/docker/neutron/neutron-agents/Dockerfile b/docker/neutron/neutron-agents/Dockerfile index 5d50bbfc1f..89ce874bba 100644 --- a/docker/neutron/neutron-agents/Dockerfile +++ b/docker/neutron/neutron-agents/Dockerfile @@ -8,7 +8,7 @@ RUN easy_install supervisor RUN pip install supervisor-stdout # Install required packages -RUN yum install -y openstack-neutron-linuxbridge \ +RUN yum install -y openstack-neutron openstack-neutron-linuxbridge \ net-tools \ && yum clean all @@ -25,6 +25,12 @@ ADD check-scripts/check-dhcp-agent.sh /opt/kolla/neutron/ ADD check-scripts/check-l3-agent.sh /opt/kolla/neutron/ ADD check-scripts/check-metadata-agent.sh /opt/kolla/neutron/ +# This is needed to workaround a problem with the agents exiting if the +# file is not present. This file really shouldn't need to be present and +# implies a configuration problem somewhere else in the code base, but +# we are out of time. +COPY fwaas_driver.ini /etc/neutron/ + # Configure supervisord RUN mkdir -p /var/log/supervisor/ ADD supervisord.conf /etc/ diff --git a/docker/neutron/neutron-agents/fwaas_driver.ini b/docker/neutron/neutron-agents/fwaas_driver.ini new file mode 100644 index 0000000000..41f761abf1 --- /dev/null +++ b/docker/neutron/neutron-agents/fwaas_driver.ini @@ -0,0 +1,3 @@ +[fwaas] +#driver = neutron.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver +#enabled = True