summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/neutron-compute
diff options
context:
space:
mode:
Diffstat (limited to 'deploy/adapters/ansible/roles/neutron-compute')
-rw-r--r--deploy/adapters/ansible/roles/neutron-compute/defaults/main.yml1
-rw-r--r--deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml5
2 files changed, 1 insertions, 5 deletions
diff --git a/deploy/adapters/ansible/roles/neutron-compute/defaults/main.yml b/deploy/adapters/ansible/roles/neutron-compute/defaults/main.yml
index 825178b2..ed97d539 100644
--- a/deploy/adapters/ansible/roles/neutron-compute/defaults/main.yml
+++ b/deploy/adapters/ansible/roles/neutron-compute/defaults/main.yml
@@ -1,2 +1 @@
---
-neutron_ovs_bridge_mappings: ""
diff --git a/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml
index 6c1f3bd9..e7ee13fc 100644
--- a/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml
@@ -28,7 +28,7 @@
with_items: services | union(services_noarch)
- name: config ml2 plugin
- template: src=ml2_conf.ini
+ template: src=templates/ml2_conf.ini
dest=/etc/neutron/plugins/ml2/ml2_conf.ini
backup=yes
@@ -44,9 +44,6 @@
- meta: flush_handlers
-- name: add br-int
- openvswitch_bridge: bridge=br-int state=present
-
- include: ../../neutron-network/tasks/odl.yml
when: "'opendaylight' in {{ NEUTRON_MECHANISM_DRIVERS }}"