diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-01-21 18:34:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-21 18:34:06 +0000 |
| commit | 4c74ad945b5b20be3014178070b495f10c16a74e (patch) | |
| tree | f76b2e9892bd056b3da3a03a0ad27c5f8d2bb9ab /patches/fuel-plugin-opendaylight/0001-ODL-leveldb-leveldbjni-Enable-arm64-support.patch | |
| parent | 2662d9c5800b67d9375c22ccac439e3aeea3b4e5 (diff) | |
| parent | e42a9b3011f96ad26f4a19db77ac44cad31a4290 (diff) | |
Merge "Uplift Armband to Fuel Newton"
Diffstat (limited to 'patches/fuel-plugin-opendaylight/0001-ODL-leveldb-leveldbjni-Enable-arm64-support.patch')
| -rw-r--r-- | patches/fuel-plugin-opendaylight/0001-ODL-leveldb-leveldbjni-Enable-arm64-support.patch | 27 |
1 files changed, 11 insertions, 16 deletions
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 5cfa99b5..5804722e 100644 --- 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 @@ -48,22 +48,18 @@ 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 1962609..ca98532 100644 --- a/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp +++ b/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp -@@ -17,6 +17,12 @@ class opendaylight::install ( - ensure => installed, - } - +@@ -15,3 +15,9 @@ class opendaylight::install ( + package { 'opendaylight': + ensure => $odl_package, ++ } ++ + if ($::osfamily == 'Debian' and $::opendaylight::arch == 'arm64') { + class { 'opendaylight::leveldbjni': -+ require => Package[$odl_package], ++ require => Package['opendaylight'], + } -+ } -+ - # quagga - class { 'opendaylight::quagga': - before => Service['opendaylight'] + } @@ -35,7 +41,8 @@ class opendaylight::install ( debug("Set odl rest api port to ${rest_port}") @@ -74,13 +70,12 @@ index 1962609..ca98532 100644 ensure => file, owner => 'odl', content => template('opendaylight/jetty.xml.erb') -@@ -71,6 +78,7 @@ class opendaylight::install ( - Package[$odl_package] -> +@@ -71,5 +78,6 @@ class opendaylight::install ( Ini_setting <||> -> Firewall <||> -> -- File <||> -> -+ File['jetty.xml'] -> -+ Class['opendaylight::leveldbjni'] -> +- File <||> ~> ++ File['jetty.xml'] ~> ++ Class['opendaylight::leveldbjni'] ~> Service['opendaylight'] } diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/leveldbjni.pp |