diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-02 17:55:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-02 17:55:31 +0000 |
| commit | 3097d3e48dd3dcb0f318663d1d0628ff1c565098 (patch) | |
| tree | 528df5ad41f91ec4ba5af756f632733e17c2cb3f /etc | |
| parent | f4d6fc6193b0d0a981433ad849c614130a13041a (diff) | |
| parent | b401a90254bcee2f588ea0d0f245dbfc8ac6a816 (diff) | |
| download | kolla-3097d3e48dd3dcb0f318663d1d0628ff1c565098.tar.gz kolla-3097d3e48dd3dcb0f318663d1d0628ff1c565098.zip | |
Merge "Add linuxbridge as option to ansible"
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/kolla/config/neutron/neutron-linuxbridge-agent.conf | 0 | ||||
| -rw-r--r-- | etc/kolla/globals.yml | 6 |
2 files changed, 5 insertions, 1 deletions
diff --git a/etc/kolla/config/neutron/neutron-linuxbridge-agent.conf b/etc/kolla/config/neutron/neutron-linuxbridge-agent.conf new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/etc/kolla/config/neutron/neutron-linuxbridge-agent.conf diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index a48580e5d..a213f262d 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -54,13 +54,17 @@ docker_restart_policy_retry: "10" #################### # The interface to use for various services types network_interface: "eth0" -neutron_interface: "eth1" +neutron_external_interface: "eth1" # These can be adjusted for even more customization api_interface: "{{ network_interface }}" storage_interface: "{{ network_interface }}" tunnel_interface: "{{ network_interface }}" +# Valid options are [ openvswitch, linuxbridge ] +neutron_plugin_agent: "openvswitch" + + #################### # Openstack options #################### |