[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>

diff --git a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/map.jinja
index e0b4959..9874f60 100644 (file)
--- 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 35ab353..e0fb091 100644 (file)
--- 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: