diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-09-21 14:48:06 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-09-21 14:57:21 +0400 |
| commit | cdf1395eb3b784b70e2e855429923e5b19edcda1 (patch) | |
| tree | 6529c33cc1df651af71055fc9b3bcb2334eac4de | |
| parent | bb08806ccec36590d326627bac6cee94d3eb1e9c (diff) | |
[odl] Turn off OF statistics polling
OpenDaylight polls OF statistics (usually superfluous) by default
which could affect performance in large scale deployments.
Also mask service only if package is installed.
Change-Id: I2f7a1da85dd5e04502f08be146bcc2ba946a631e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
| -rw-r--r-- | mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja | 1 | ||||
| -rw-r--r-- | mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja index e0b495952..9874f60cf 100644 --- a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja +++ b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja @@ -16,6 +16,7 @@ 'enable_ha': false, 'ha_node_ips': [], 'ha_node_index': 0, + 'stats_polling_enabled': false, 'dhcp': { 'enabled': false, 'dynamic_allocation_pool_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 35ab35391..e0fb0912c 100644 --- a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls +++ b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls @@ -41,6 +41,8 @@ opendaylight_service_mask: service.masked: - name: opendaylight {%- endif %} + - prereq: + - pkg: opendaylight opendaylight: pkg.installed: @@ -56,6 +58,7 @@ opendaylight: - file: /opt/opendaylight/bin/setenv - ini: /opt/opendaylight/etc/org.apache.karaf.features.cfg - ini: /opt/opendaylight/etc/org.ops4j.pax.web.cfg + - ini: /opt/opendaylight/etc/org.opendaylight.openflowplugin.cfg /opt/opendaylight/etc/jetty.xml: file.managed: @@ -88,6 +91,11 @@ opendaylight: org.ops4j.pax.web.listening.addresses: {{ server.odl_bind_ip }} org.osgi.service.http.port: {{ server.odl_rest_port }} +/opt/opendaylight/etc/org.opendaylight.openflowplugin.cfg: + ini.options_present: + - sections: + is-statistics-polling-on: {{ server.stats_polling_enabled }} + {%- if server.get('router_enabled', false) %} /opt/opendaylight/etc/custom.properties: ini.options_present: |