fuel-plugin-odl: Patch leveldb before jetty.xml

With systemd, leveldb patching happens too late, and the cache
(/opt/opendaylight/data/cache) gets corrupted.

Try moving the leveldbjni puppet class before jetty.xml patching,
and also transform notification arrow into simple ordering arrow.

While at it, simplify patch by removing obsolete fragments.

JIRA: ARMBAND-202

Change-Id: I168b13266f2b4eeac4b8c8008d248f1884858b67
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/patches/fuel-plugin-opendaylight/0001-ODL-leveldb-leveldbjni-Enable-arm64-support.patch b/patches/fuel-plugin-opendaylight/0001-ODL-leveldb-leveldbjni-Enable-arm64-support.patch
index 5804722..30e9010 100644 (file)
--- a/patches/fuel-plugin-opendaylight/0001-ODL-leveldb-leveldbjni-Enable-arm64-support.patch
+++ b/patches/fuel-plugin-opendaylight/0001-ODL-leveldb-leveldbjni-Enable-arm64-support.patch
@@ -16,18 +16,20 @@ For more info about this ODL limitation, see [1].
 [ Alexandru.Avadanii@enea.com ]
 Remove JAVA8 changes after upstream rework.
 Convert puppet patching to prebuilt DEB package, as part of [2].
+Rebase for Fuel Newton.
 
 [1] https://bugs.opendaylight.org/show_bug.cgi?id=3973
 [2] https://jira.opnfv.org/browse/ARMBAND-114
 
+Change-Id: Ia7abf375ffd122ff0ac7b12422f64526ff2c78fd
 Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com>
 Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- .../puppet/modules/opendaylight/manifests/init.pp  |  8 ++++++++
- .../modules/opendaylight/manifests/install.pp      | 12 +++++++++--
- .../modules/opendaylight/manifests/leveldbjni.pp   | 24 ++++++++++++++++++++++
- 3 files changed, 42 insertions(+), 2 deletions(-)
+ .../puppet/modules/opendaylight/manifests/init.pp  |  8 +++++++
+ .../modules/opendaylight/manifests/install.pp      |  7 ++++++
+ .../modules/opendaylight/manifests/leveldbjni.pp   | 25 ++++++++++++++++++++++
+ 3 files changed, 40 insertions(+)
  create mode 100644 deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp
 
 diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/init.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/init.pp
@@ -48,39 +50,33 @@ index 69cc23a..791ceba 100644
 +  }
  }
 diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp
+index 2c3d776..673ccb3 100644
 --- a/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp
 +++ b/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp
-@@ -15,3 +15,9 @@ class opendaylight::install (
-   package { 'opendaylight':
+@@ -20,6 +20,12 @@ class opendaylight::install (
      ensure  => $odl_package,
-+  }
-+
+   }
+
 +  if ($::osfamily == 'Debian' and $::opendaylight::arch == 'arm64') {
 +    class { 'opendaylight::leveldbjni':
 +      require => Package['opendaylight'],
 +    }
-   }
-@@ -35,7 +41,8 @@ class opendaylight::install (
-
-   debug("Set odl rest api port to ${rest_port}")
-
--  file { "${conf_dir}/jetty.xml":
-+  file { 'jetty.xml':
-+    path    => "${conf_dir}/jetty.xml",
-     ensure  => file,
-     owner   => 'odl',
-     content => template('opendaylight/jetty.xml.erb')
-@@ -71,5 +78,6 @@ class opendaylight::install (
++  }
++
+   #Temporary solution until number of allowed open files
+   #will be fixed in main systemd service file
+   file {'/etc/systemd/system/opendaylight.service.d':
+@@ -88,6 +94,7 @@ class opendaylight::install (
+   Package['opendaylight'] ->
    Ini_setting <||> ->
    Firewall <||> ->
--  File <||> ~>
-+  File['jetty.xml'] ~>
-+  Class['opendaylight::leveldbjni'] ~>
++  Class['opendaylight::leveldbjni'] ->
+   File <||> ~>
    Service['opendaylight']
  }
 diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp
 new file mode 100644
-index 0000000..ed97c5d
+index 0000000..0a20fa3
 --- /dev/null
 +++ b/deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp
 @@ -0,0 +1,25 @@