diff options
Diffstat (limited to 'patches/fuel-plugin-opendaylight')
3 files changed, 20 insertions, 20 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 d8fe07da..f1a1d412 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 @@ -104,10 +104,10 @@ index 0000000..08a528b + </instructions> + </configuration> diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/init.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/init.pp -index a322f70..f71bfc8 100644 +index 69cc23a..791ceba 100644 --- a/deployment_scripts/puppet/modules/opendaylight/manifests/init.pp +++ b/deployment_scripts/puppet/modules/opendaylight/manifests/init.pp -@@ -10,4 +10,12 @@ class opendaylight { +@@ -9,4 +9,12 @@ class opendaylight { $odl_mgmt_ips = values($odl_mgmt_ips_hash) $odl_nodes_names = keys($odl_mgmt_ips_hash) $node_internal_address = $odl_mgmt_ips_hash["node-${node_uid}"] @@ -121,13 +121,13 @@ index a322f70..f71bfc8 100644 + } } diff --git a/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp b/deployment_scripts/puppet/modules/opendaylight/manifests/install.pp -index 924a840..d55a311 100644 +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, } - + + if ($::osfamily == 'Debian' and $::opendaylight::arch == 'arm64') { + class { 'opendaylight::leveldbjni': + require => Package[$odl_package], @@ -138,9 +138,9 @@ index 924a840..d55a311 100644 class { 'opendaylight::quagga': before => Service['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", @@ -313,10 +313,10 @@ index 0000000..5125fc7 + } +} diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml -index 3706678..841bfee 100644 +index 20bd24f..e324ff5 100644 --- a/deployment_tasks.yaml +++ b/deployment_tasks.yaml -@@ -17,7 +17,7 @@ +@@ -20,7 +20,7 @@ parameters: puppet_manifest: puppet/manifests/odl-install.pp puppet_modules: puppet/modules:/etc/puppet/modules diff --git a/patches/fuel-plugin-opendaylight/0002-opnfv-quagga-Build-for-UBUNTU_ARCH.patch b/patches/fuel-plugin-opendaylight/0002-opnfv-quagga-Build-for-UBUNTU_ARCH.patch index a44222ab..e6e7716f 100644 --- a/patches/fuel-plugin-opendaylight/0002-opnfv-quagga-Build-for-UBUNTU_ARCH.patch +++ b/patches/fuel-plugin-opendaylight/0002-opnfv-quagga-Build-for-UBUNTU_ARCH.patch @@ -30,21 +30,21 @@ branch "stable/colorado", including prebuilt binaries (DEBs) for: Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - pre_build_hook | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) + pre_build_hook | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pre_build_hook b/pre_build_hook -index f973826..953e66c 100755 +index 0296821..a6d55e9 100755 --- a/pre_build_hook +++ b/pre_build_hook -@@ -41,9 +41,17 @@ NETWORKING_ODL_BRANCH=${NETWORKING_ODL_BRANCH:-stable/mitaka} +@@ -53,9 +53,17 @@ NETWORKING_ODL_BRANCH=${NETWORKING_ODL_BRANCH:-stable/mitaka} OPNFV_QUAGGE_PACKAGING_REPO=${OPNFV_QUAGGE_PACKAGING_REPO:-https://github.com/nikolas-hermanns/opnfv-quagga-packaging} OPNFV_QUAGGE_PACKAGING_BRANCH=stable/colorado - + -# For which systems odl package should be build +# For which systems odl package should be built BUILD_FOR=${BUILD_FOR:-ubuntu} - + +# For which architecture(s) package should be built +# Only applicable when "BUILD_FOR=ubuntu" +# ODL itself is mostly arch-indep, but its deps are not @@ -56,7 +56,7 @@ index f973826..953e66c 100755 DIR="$(dirname `readlink -f $0`)" TMP_DIR="${DIR}/tmp" MODULES="${DIR}/deployment_scripts/puppet/modules" -@@ -74,7 +82,10 @@ function add_opnfv_quagga { +@@ -86,7 +94,10 @@ function add_opnfv_quagga { sudo apt-get -y install `cat requirements.txt` make -j6 fi @@ -67,4 +67,4 @@ index f973826..953e66c 100755 + done popd popd - + diff --git a/patches/fuel-plugin-opendaylight/0003-FIXME-ODL-wget-no-check-certificate-for-cache.patch b/patches/fuel-plugin-opendaylight/0003-FIXME-ODL-wget-no-check-certificate-for-cache.patch index b57de503..8b2d1a38 100644 --- a/patches/fuel-plugin-opendaylight/0003-FIXME-ODL-wget-no-check-certificate-for-cache.patch +++ b/patches/fuel-plugin-opendaylight/0003-FIXME-ODL-wget-no-check-certificate-for-cache.patch @@ -28,15 +28,15 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pre_build_hook b/pre_build_hook -index 4785917..c3dd664 100755 +index a6d55e9..21e7a99 100755 --- a/pre_build_hook +++ b/pre_build_hook -@@ -64,7 +64,7 @@ function cleanup { +@@ -76,7 +76,7 @@ function cleanup { } - + function download { - wget "$1" -qO $2 + wget --no-check-certificate "$1" -qO $2 } - + function unpack { |