Add openvswitch support

Change-Id: I3cfe8916df0a8d31db11bf777b626669d88e4a84
Implement: blueprint openvswitch
This commit is contained in:
Michal Rostecki
2016-02-19 16:22:45 +01:00
parent af51dca89d
commit f04cabd88d
5 changed files with 10 additions and 6 deletions

View File

@@ -66,8 +66,7 @@ storage_interface: "{{ network_interface }}"
tunnel_interface: "{{ network_interface }}"
# Valid options are [ openvswitch, linuxbridge ]
# neutron_plugin_agent: "openvswitch"
neutron_plugin_agent: "linuxbridge"
neutron_plugin_agent: "openvswitch"
# The default ports used by each service.
mariadb_port: "3306"

View File

@@ -4,8 +4,6 @@
type_drivers = flat,vlan,vxlan
tenant_network_types = vxlan
mechanism_drivers = openvswitch,l2population
[ml2_type_vlan]
network_vlan_ranges =

View File

@@ -1,5 +1,5 @@
[ml2]
mechanism_drivers = openvswitch.l2population
mechanism_drivers = openvswitch,l2population
[securitygroup]
firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver

View File

@@ -12,7 +12,7 @@ container:
mode: RO
service:
daemon:
dependencies: [openvswitch-tasks/setup_ovs_bridge]
dependencies: [neutron_ansible_tasks/create_user, rabbitmq/daemon, openvswitch-tasks/setup_ovs_bridge]
command: neutron-openvswitch-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
files:
neutron.conf.j2:

View File

@@ -10,7 +10,14 @@ task:
mem: {{ infra_mem }}
cpus: {{ infra_cpus }}
commands:
check_ovs_db:
dependencies: [openvswitch-db/daemon]
run_once: True
retries: 30
delay: 5
command: ovs-vsctl --no-wait show
setup_ovs_bridge:
dependencies: [openvswitch-tasks/check_ovs_db]
run_once: True
retries: 10
delay: 5