diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-23 13:28:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-23 13:28:19 +0000 |
| commit | 1c86345529f183a16c347c50516e6ded6c7a3606 (patch) | |
| tree | af8e30ee18b87eb850e36cfab7f4e6fe8c323e62 | |
| parent | ea0c1a14cc223e5433f455948f1b9134fd5bf3de (diff) | |
| parent | 4789f9188a511d1422d99c3349d1e72ab03cddb4 (diff) | |
| download | kolla-1c86345529f183a16c347c50516e6ded6c7a3606.tar.gz kolla-1c86345529f183a16c347c50516e6ded6c7a3606.zip | |
Merge "Allows neutron-agents l3 agent to communicate with OVS"
| -rw-r--r-- | ansible/roles/neutron/tasks/start.yml | 1 | ||||
| -rw-r--r-- | docker/centos/binary/neutron/neutron-base/Dockerfile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ansible/roles/neutron/tasks/start.yml b/ansible/roles/neutron/tasks/start.yml index 4cecfc35b..1cee99d5b 100644 --- a/ansible/roles/neutron/tasks/start.yml +++ b/ansible/roles/neutron/tasks/start.yml @@ -44,6 +44,7 @@ container_name: "neutron_agents" container_privileged: "True" container_volumes: + - "/run:/run" - "{{ node_config_directory }}/neutron-agents/:/opt/kolla/neutron-agents/:ro" when: inventory_hostname in groups['neutron-agents'] diff --git a/docker/centos/binary/neutron/neutron-base/Dockerfile b/docker/centos/binary/neutron/neutron-base/Dockerfile index 106068a21..59d658592 100644 --- a/docker/centos/binary/neutron/neutron-base/Dockerfile +++ b/docker/centos/binary/neutron/neutron-base/Dockerfile @@ -4,6 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install openstack-neutron \ openstack-neutron-ml2 \ python-neutron-client \ + openvswitch \ && yum clean all COPY config-neutron.sh config-sudoers.sh /opt/kolla/ |