diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-07-04 15:54:11 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-07-05 17:06:35 +0400 |
| commit | de6a685915bc8bd5444217bca511da35c94b4d59 (patch) | |
| tree | 1d861f14ef74e24cd9bdae67d59abaf6a91b194c /mcp/salt-formulas | |
| parent | e49e91d7aa740437c01e6531ef648d2dae97c11d (diff) | |
Turn on opendaylight scenario
* fix formula & reclass cluster model
* bring in running states
Change-Id: I8e66e69045f5c745f9aa6f59f7ce6d66b5bf1c95
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/salt-formulas')
| -rw-r--r-- | mcp/salt-formulas/opendaylight/client.sls | 4 |
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 %} |