Merge "Start using orchestration_engine variable"

3d1171f0 · Jenkins · Gerrit Code Review · d9db6bb8 · 4d6afc67 · 3d1171f0
Commit 3d1171f0 authored 8 years ago by Jenkins Committed by Gerrit Code Review 8 years ago
--- a/ansible/roles/neutron/templates/openvswitch-db-server.json.j2
+++ b/ansible/roles/neutron/templates/openvswitch-db-server.json.j2
 {
-    "command": "start-ovsdb-server {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} {% if keystone_replicas is defined %} {{ neutron_bridge_name }} {{ neutron_external_interface }} {% endif %}",
+    "command": "start-ovsdb-server {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} {% if orchestration_engine == 'KUBERNETES' %} {{ neutron_bridge_name }} {{ neutron_external_interface }} {% endif %}",
    "config_files": []
 }