diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-21 12:00:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-21 12:00:32 +0000 |
| commit | 857797a2c50d20299dac43135bd8f688905b9d37 (patch) | |
| tree | 6f933e01a16bd327e158c64e93c8a4c81d69baed /mcp | |
| parent | 0872be9745b6cd4f0e99b518c55a7824ec04a2c7 (diff) | |
| parent | cdf1395eb3b784b70e2e855429923e5b19edcda1 (diff) | |
Merge "[odl] Turn off OF statistics polling"
Diffstat (limited to 'mcp')
| -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: |