mcp: salt-formulas: opendaylight: AArch64 leveldb

[fuel.git] / mcp / salt-formulas / opendaylight / server.sls

diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls
index f953cdd..453d244 100644 (file)
--- a/mcp/salt-formulas/opendaylight/server.sls
+++ b/mcp/salt-formulas/opendaylight/server.sls
@@ -15,10 +15,10 @@ opendaylight_repo_key:
     - name: "apt-key adv --keyserver keyserver.ubuntu.com --recv 44C05248"
 {%- if system.proxy is defined and system.proxy.keyserver is defined %}
     - env:
-{%- if system.proxy.keyserver.http is defined %}
+{%- if system.proxy.keyserver.http is defined and grains['dns']['nameservers'][0] in system.proxy.keyserver.http %}
       - http_proxy: {{ system.proxy.keyserver.http }}
 {%- endif %}
-{%- if system.proxy.keyserver.https is defined %}
+{%- if system.proxy.keyserver.https is defined and grains['dns']['nameservers'][0] in system.proxy.keyserver.https %}
       - https_proxy: {{ system.proxy.keyserver.https }}
 {%- endif %}
 {%- endif %}
@@ -29,8 +29,8 @@ opendaylight_repo:
   # https://github.com/saltstack/salt/pull/45224
   # - ppa: {{ server.repo }}
   - human_name: opendaylight-ppa
-  - name: deb http://ppa.launchpad.net/odl-team/nitrogen/ubuntu xenial main
-  - file: /etc/apt/sources.list.d/odl-team-ubuntu-nitrogen-xenial.list
+  - name: deb http://ppa.launchpad.net/odl-team/{{ server.version }}/ubuntu xenial main
+  - file: /etc/apt/sources.list.d/odl-team-ubuntu-{{ server.version }}-xenial.list
 
 opendaylight:
   pkg.installed:
@@ -49,6 +49,13 @@ opendaylight:
     - ini: /opt/opendaylight/etc/org.apache.karaf.features.cfg
     - ini: /opt/opendaylight/etc/org.ops4j.pax.web.cfg
 
+# TODO: use service.masked state once salt get updated to 2017.7.0+
+service.mask:
+  module.run:
+  - m_name: opendaylight
+  - require_in:
+    - pkg: opendaylight
+
 /opt/opendaylight/etc/jetty.xml:
   file.managed:
   - source: salt://opendaylight/files/jetty.xml
@@ -78,6 +85,7 @@ opendaylight:
   ini.options_present:
     - sections:
         org.ops4j.pax.web.listening.addresses: {{ server.odl_bind_ip }}
+        org.osgi.service.http.port: {{ server.odl_rest_port }}
 
 {%- if server.get('router_enabled', false) %}
 /opt/opendaylight/etc/custom.properties:
@@ -91,4 +99,9 @@ opendaylight:
       - service: opendaylight
 {%- endif %}
 
+{%- if grains['cpuarch'] == 'aarch64' %}
+opendaylight-leveldbjni:
+  pkg.installed
+{%- endif %}
+
 {%- endif %}