aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-19 15:06:07 +0000
committerGerrit Code Review <review@openstack.org>2016-08-19 15:06:07 +0000
commit3d1171f0d3932b3636e65adc473c2bacf46093f5 (patch)
tree554f653ab01f20afb5ac04da4f641d4799f6e3dc
parentd9db6bb81e9be6a1d5285f9b316606c1de44fce9 (diff)
parent4d6afc67be818b5306dee035a32260c26694acf8 (diff)
downloadkolla-3d1171f0d3932b3636e65adc473c2bacf46093f5.tar.gz
kolla-3d1171f0d3932b3636e65adc473c2bacf46093f5.zip
Merge "Start using orchestration_engine variable"
-rw-r--r--ansible/roles/neutron/templates/openvswitch-db-server.json.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/ansible/roles/neutron/templates/openvswitch-db-server.json.j2 b/ansible/roles/neutron/templates/openvswitch-db-server.json.j2
index ebabe280f..d352d9297 100644
--- a/ansible/roles/neutron/templates/openvswitch-db-server.json.j2
+++ b/ansible/roles/neutron/templates/openvswitch-db-server.json.j2
@@ -1,4 +1,4 @@
{
- "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": []
}