openstack/kolla-ansible
Code Issues Proposed changes

Fix the native ovsdb_interace failed

Browse Source 
Closes-Bug: #1598977
Change-Id: I8be53531c2ba000c3b73d0f957dcc50fe947c925
This commit is contained in:
Jeffrey Zhang 2016-07-01 12:09:11 +08:00
parent 9b05eb87b8
commit 10258f138b
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/roles/neutron/templates/ml2_conf.ini.j2
View File

@ -52,6 +52,7 @@ arp_responder = true
[ovs] [ovs]
bridge_mappings = physnet1:{{ neutron_bridge_name }} bridge_mappings = physnet1:{{ neutron_bridge_name }}
ovsdb_connection = tcp:{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:6640
{% if enable_nova_fake | bool %} {% if enable_nova_fake | bool %}
integration_bridge = br-int-{{ item }} integration_bridge = br-int-{{ item }}
{% endif %} {% endif %}

2
ansible/roles/neutron/templates/neutron-dhcp-agent.json.j2
View File

@ -1,5 +1,5 @@
{ {
"command": "neutron-dhcp-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini", "command": "neutron-dhcp-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --config-file /etc/neutron/dhcp_agent.ini",
"config_files": [ "config_files": [
{ {
"source": "{{ container_config_directory }}/neutron.conf", "source": "{{ container_config_directory }}/neutron.conf",

2
ansible/roles/neutron/templates/openvswitch-db-server.json.j2
View File

@ -1,4 +1,4 @@
{ {
"command": "/usr/sbin/ovsdb-server /etc/openvswitch/conf.db -vconsole:emer -vsyslog:err -vfile:info --remote=punix:/run/openvswitch/db.sock --log-file=/var/log/kolla/openvswitch/ovsdb-server.log", "command": "/usr/sbin/ovsdb-server /etc/openvswitch/conf.db -vconsole:emer -vsyslog:err -vfile:info --remote=punix:/run/openvswitch/db.sock --remote=ptcp:6640:{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} --log-file=/var/log/kolla/openvswitch/ovsdb-server.log",
"config_files": [] "config_files": []
} }

4
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -9,6 +9,7 @@ RUN yum -y install \
openstack-neutron-ml2 \ openstack-neutron-ml2 \
openvswitch \ openvswitch \
openstack-neutron-lbaas \ openstack-neutron-lbaas \
python-openvswitch \
&& yum clean all && yum clean all
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
@ -17,6 +18,7 @@ RUN apt-get -y install --no-install-recommends \
neutron-plugin-ml2 \ neutron-plugin-ml2 \
neutron-server \ neutron-server \
openvswitch-switch \ openvswitch-switch \
python-openvswitch \
neutron-lbaas-agent \ neutron-lbaas-agent \
&& apt-get clean \ && apt-get clean \
&& mkdir -p /usr/share/neutron \ && mkdir -p /usr/share/neutron \
@ -32,6 +34,7 @@ RUN yum -y install \
dnsmasq-utils \ dnsmasq-utils \
ipset \ ipset \
openvswitch \ openvswitch \
python-openvswitch \
uuid \ uuid \
&& yum clean all && yum clean all
@ -45,6 +48,7 @@ RUN apt-get -y install --no-install-recommends \
ipset \ ipset \
iptables \ iptables \
openvswitch-switch \ openvswitch-switch \
python-openvswitch \
uuid-runtime \ uuid-runtime \
&& apt-get clean && apt-get clean