aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-07-30 16:09:53 +0000
committerSam Yaple <sam@yaple.net>2015-08-02 11:48:21 +0000
commitb401a90254bcee2f588ea0d0f245dbfc8ac6a816 (patch)
tree88bc9f70f2759db708c0db17a20dbf17d6ab1776 /etc
parent38418befc0943e22d7ffb494c9e51264c5cac16c (diff)
downloadkolla-b401a90254bcee2f588ea0d0f245dbfc8ac6a816.tar.gz
kolla-b401a90254bcee2f588ea0d0f245dbfc8ac6a816.zip
Add linuxbridge as option to ansible
Allows the user to configure neutron_plugin_agent value for Ansible. Current allowed values are openvswitch and linuxbridge. Implements: blueprint ansible-neutron-linuxbridge Change-Id: I0572464a5459d2f9da09b6da22db16e240511f99
Diffstat (limited to 'etc')
-rw-r--r--etc/kolla/config/neutron/neutron-linuxbridge-agent.conf0
-rw-r--r--etc/kolla/globals.yml6
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 adfa1c347..4d5fb7c9b 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
####################