Merge "Update OpenDaylight version to Neon"

8 files changed, 32 insertions, 10 deletions

diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight
index c263f0f27..eb6cc6524 100755
--- a/mcp/config/states/opendaylight
+++ b/mcp/config/states/opendaylight
@@ -19,3 +19,7 @@ function odl() {
 
 wait_for 5.0 "salt -I 'opendaylight:server' state.sls opendaylight"
 wait_for 20 "salt --out yaml -C 'I@neutron:server and *01*' network.connect $(odl bind_ip) $(odl rest_port) | fgrep -q 'result: true'"
+
+# https://bugs.launchpad.net/networking-odl/+bug/1822559
+salt -I 'linux:network:bridge:openvswitch' pkg.install python3-networking-odl
+salt -I 'linux:network:bridge:openvswitch' file.patch /usr/lib/python3/dist-packages/networking_odl/cmd/set_ovs_hostconfigs.py /var/tmp/odl_hostconfig.patch || true
diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2
index 51f86b252..531e01f92 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-ha/opendaylight/control.yml.j2
@@ -24,7 +24,6 @@ parameters:
       router_enabled: true
       netvirt_natservice:
         nat_mode: conntrack
-        snat_punt_timeout: 0
       karaf_features:
         odl_default:
           - odl-restconf-all
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
index 916219576..c3d0d187d 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/opendaylight/control.yml.j2
@@ -22,7 +22,6 @@ parameters:
       router_enabled: true
       netvirt_natservice:
         nat_mode: conntrack
-        snat_punt_timeout: 0
       karaf_features:
         odl_default:
           - odl-restconf-all
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
index 863f24def..1e10cac3b 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/compute.yml.j2
@@ -104,3 +104,15 @@ parameters:
           name_servers: {{ nm.dns_public }}
           noifupdown: true
 {%- endif %}
+    system:
+      file:
+        /var/tmp/odl_hostconfig.patch:
+          contents: |
+            420c420
+            <                 if datapath_types.find(datapath_type) >= 0)
+            ---
+            >                 if datapath_type in datapath_types)
+            460c460
+            <         return subprocess.check_output(command_line).strip()  # nosec
+            ---
+            >         return subprocess.check_output(command_line).strip().decode()  # nosec
diff --git a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2
index 93313adc7..946cdda03 100644
--- a/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-noha/openstack/gateway.yml.j2
@@ -43,3 +43,15 @@ parameters:
           use_interfaces:
             - {{ ma.interface_str(nm.ctl01.nic_private, vlan_private_start) }}
 {%- endif %}
+    system:
+      file:
+        /var/tmp/odl_hostconfig.patch:
+          contents: |
+            420c420
+            <                 if datapath_types.find(datapath_type) >= 0)
+            ---
+            >                 if datapath_type in datapath_types)
+            460c460
+            <         return subprocess.check_output(command_line).strip()  # nosec
+            ---
+            >         return subprocess.check_output(command_line).strip().decode()  # nosec
diff --git a/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/cluster.yml b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/cluster.yml
index 3b57ea332..3554d786e 100644
--- a/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/cluster.yml
+++ b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/cluster.yml
@@ -13,7 +13,7 @@ classes:
   - service.haproxy.proxy.single
 parameters:
   _param:
-    opendaylight_version: fluorine
+    opendaylight_version: neon
     cluster_vip_address: ${_param:opendaylight_service_host}
     keepalived_vip_virtual_router_id: 199
     keepalived_vip_password: ${_param:opnfv_main_password}
@@ -25,8 +25,6 @@ parameters:
       version: ${_param:opendaylight_version}
       repo: 'odl-team/${_param:opendaylight_version}'
       cluster_enabled: true
-      logging:
-        engine: syslog
   keepalived:
     cluster:
       vrrp_scripts:
diff --git a/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml
index 82c141e87..36736be0a 100644
--- a/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml
+++ b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/single.yml
@@ -10,11 +10,9 @@ applications:
   - opendaylight
 parameters:
   _param:
-    opendaylight_version: fluorine
+    opendaylight_version: neon
   opendaylight:
     server:
       enabled: 'True'
       version: ${_param:opendaylight_version}
       repo: 'odl-team/${_param:opendaylight_version}'
-      logging:
-        engine: syslog
diff --git a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/repo.sls b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/repo.sls
index 175108ef3..1f322c53f 100644
--- a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/repo.sls
+++ b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/repo.sls
@@ -52,5 +52,5 @@ opendaylight_repo:
   # https://github.com/saltstack/salt/pull/45224
   # - ppa: {{ server.repo }}
   - human_name: opendaylight-ppa
-  - 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
+  - name: deb http://ppa.launchpad.net/{{ server.repo }}/ubuntu {{ grains.oscodename }} main
+  - file: /etc/apt/sources.list.d/odl-team-{{ server.version }}.list