aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/salt-formulas')
-rw-r--r--mcp/salt-formulas/opendaylight/client.sls4
1 files changed, 4 insertions, 0 deletions
diff --git a/mcp/salt-formulas/opendaylight/client.sls b/mcp/salt-formulas/opendaylight/client.sls
index 1abe8743f..2a56d49dd 100644
--- a/mcp/salt-formulas/opendaylight/client.sls
+++ b/mcp/salt-formulas/opendaylight/client.sls
@@ -5,6 +5,7 @@ opendaylight_client_packages:
pkg.installed:
- pkgs: {{ client.pkgs }}
+{%- if pillar.linux.network.bridge is defined and pillar.linux.network.bridge == 'openvswitch' %}
ovs_set_manager:
cmd.run:
- name: "ovs-vsctl set-manager {{ client.ovsdb_server_iface }} {{ client.ovsdb_odl_iface }}"
@@ -17,11 +18,14 @@ ovs_set_tunnel_endpoint:
- require:
- cmd: ovs_set_manager
+{%- if client.provider_mappings is defined %}
ovs_set_provider_mapping:
cmd.run:
- name: "ovs-vsctl set Open_vSwitch . other_config:provider_mappings={{ client.provider_mappings }}"
- unless: "ovs-vsctl get Open_vSwitch . other_config | fgrep provider_mappings"
- require:
- cmd: ovs_set_manager
+{%- endif %}
{%- endif %}
+{%- endif %}