diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-10-22 12:36:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-22 12:36:23 +0000 |
| commit | b6d00190ea2d1cc166b39f1db59912b3f572f248 (patch) | |
| tree | e5b4765a08ca6d3cc6bcab92e580a7d65966f664 /mcp/salt-formulas/salt-formula-opendaylight/opendaylight | |
| parent | d176f3e13ad34afb2c292710ddb513fb33b55339 (diff) | |
| parent | 6160264a0bd6d01552e120d2ea9dc11629fe4088 (diff) | |
Merge "[ha] Run OpenDaylight in cluster mode"
Diffstat (limited to 'mcp/salt-formulas/salt-formula-opendaylight/opendaylight')
| -rw-r--r-- | mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja | 5 | ||||
| -rw-r--r-- | mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja index 9874f60cf..f8d49643b 100644 --- a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja +++ b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja @@ -13,9 +13,8 @@ 'odl_bind_ip': '0.0.0.0', 'repo': 'odl-team/oxygen', 'log_levels': {}, - 'enable_ha': false, - 'ha_node_ips': [], - 'ha_node_index': 0, + 'cluster_enabled': false, + 'seed_nodes_list': [], 'stats_polling_enabled': false, 'dhcp': { 'enabled': false, diff --git a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls index 1ae23d61a..e4ebecf87 100644 --- a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls +++ b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls @@ -69,6 +69,14 @@ opendaylight_service_mask: - prereq: - pkg: opendaylight +{%- if server.cluster_enabled %} +configure_cluster: + cmd.run: + - name: /opt/opendaylight/bin/configure-cluster-ipdetect.sh {{ server.seed_nodes_list }} + - require: + - pkg: opendaylight +{%- endif %} + opendaylight: pkg.installed: - require: |