From 0f453d22e715e2e5cd233b4775e6c159e5b72e54 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Mon, 8 Sep 2025 22:08:06 +1000 Subject: [PATCH 1/4] Chore: Remove clustering scripts Remove clustering scripts that have been migrated to controller repository as part of CONTROLLER-1581. Files removed: - configure-cluster-ipdetect.sh - configure_cluster.sh - custom_shard_config.txt - set_persistence.sh These scripts are now maintained in controller.git with full git history preservation and we pick them up by using controller's karaf4-parent. Change-Id: I53973bba4b31d70ab556c6e311ee892f5e5396f3 Signed-off-by: Anil Belur Signed-off-by: Robert Varga --- .../bin/configure-cluster-ipdetect.sh | 265 ------------------ .../main/assembly/bin/configure_cluster.sh | 228 --------------- .../main/assembly/bin/custom_shard_config.txt | 17 -- .../src/main/assembly/bin/set_persistence.sh | 111 -------- karaf/pom.xml | 4 +- onap-karaf/pom.xml | 4 +- 6 files changed, 4 insertions(+), 625 deletions(-) delete mode 100755 karaf-scripts/src/main/assembly/bin/configure-cluster-ipdetect.sh delete mode 100755 karaf-scripts/src/main/assembly/bin/configure_cluster.sh delete mode 100644 karaf-scripts/src/main/assembly/bin/custom_shard_config.txt delete mode 100755 karaf-scripts/src/main/assembly/bin/set_persistence.sh diff --git a/karaf-scripts/src/main/assembly/bin/configure-cluster-ipdetect.sh b/karaf-scripts/src/main/assembly/bin/configure-cluster-ipdetect.sh deleted file mode 100755 index 909ff780..00000000 --- a/karaf-scripts/src/main/assembly/bin/configure-cluster-ipdetect.sh +++ /dev/null @@ -1,265 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2015 Brocade Communications Systems, Inc. and others. All rights reserved. -# Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v1.0 which accompanies this distribution, -# and is available at http://www.eclipse.org/legal/epl-v10.html -# - - -function usage() -{ - # Print any error messages - test "$1" != "" && echo " ERROR: $1" - - # Print standard usage help - cat << EOF - This script is used to configure cluster parameters on this - controller. The user should restart controller to apply changes. - - Usage: $0 - - seed_nodes_list: List of seed nodes, separated by comma or space. - - The script checks that one (any) of the the controller's active IP - addresses is present in the seed_nodes_list. When running this script - on multiple seed nodes, keep the seed_node_list same on all nodes. - - Optionally, shards can be configured in a more granular way by - modifying the file "custom_shard_configs.txt" in the same folder - as this tool. Please see that file for more details. - -This script is currently limited to IPv4 addresses. If you have -problems running this script, please use 'configure_cluster.sh'. - -EOF - - exit 1 -} - - -function start_banner -{ -cat < ${MODULESHARDSCONF} - modules_builder > ${MODULESCONF} - cat ${MODULESCONF} - fi - - echo "Configuring replication type in module-shards.conf" - sed -i -e "/^[^#].*replicas[ ]*=/ { :loop /.*\]/ b done; N; b loop; :done s/replicas.*\]/replicas = [${MEMBER_NAME_LIST}]/}" ${MODULESHARDSCONF} -} - - -function verify_configuration_files -{ - # Constants - BIN_DIR=`dirname $0` - test ${BIN_DIR} == '.' && BIN_DIR=${PWD} - CONTROLLER_DIR=`dirname ${BIN_DIR}` - CONF_DIR=${CONTROLLER_DIR}/configuration/initial - AKKACONF=${CONF_DIR}/pekko.conf - MODULESCONF=${CONF_DIR}/modules.conf - MODULESHARDSCONF=${CONF_DIR}/module-shards.conf - - # Verify configuration files are present in expected location. - if [ ! -f ${AKKACONF} -o ! -f ${MODULESHARDSCONF} ]; then - # Check if the configuration files exist in the system - # directory, then copy them over. - ORIG_CONF_DIR=${CONTROLLER_DIR}/system/org/opendaylight/controller/sal-clustering-config - version=$(sed -n -e 's/.*\(.*\)<\/version>/\1/p' ${ORIG_CONF_DIR}/maven-metadata-local.xml) - ORIG_CONF_DIR=${ORIG_CONF_DIR}/${version} - ORIG_AKKA_CONF=sal-clustering-config-${version}-pekkoconf.xml - ORIG_MODULES_CONF=sal-clustering-config-${version}-moduleconf.xml - ORIG_MODULESHARDS_CONF=sal-clustering-config-${version}-moduleshardconf.xml - - if [ -f ${ORIG_CONF_DIR}/${ORIG_AKKA_CONF} -a \ - -f ${ORIG_CONF_DIR}/${ORIG_MODULES_CONF} -a \ - -f ${ORIG_CONF_DIR}/${ORIG_MODULESHARDS_CONF} ]; then - cat < - - index: Integer within 1..N, where N is the number of seed nodes. - - seed_nodes_list: List of seed nodes, separated by comma or space. - - The address at the provided index should belong this controller. - When running this script on multiple seed nodes, keep the - seed_node_list same, and vary the index from 1 through N. - - Optionally, shards can be configured in a more granular way by - modifying the file "custom_shard_configs.txt" in the same folder - as this tool. Please see that file for more details - -EOF - - exit 1 -} - - -function start_banner -{ -cat < ${MODULESHARDSCONF} - modules_builder > ${MODULESCONF} - cat ${MODULESCONF} - fi - - echo "Configuring replication type in module-shards.conf" - sed -i -e "/^[^#].*replicas[ ]*=/ { :loop /.*\]/ b done; N; b loop; :done s/replicas.*\]/replicas = [${MEMBER_NAME_LIST}]/}" ${MODULESHARDSCONF} -} - - -function verify_configuration_files -{ - # Constants - BIN_DIR=`dirname $0` - test ${BIN_DIR} == '.' && BIN_DIR=${PWD} - CONTROLLER_DIR=`dirname ${BIN_DIR}` - CONF_DIR=${CONTROLLER_DIR}/configuration/initial - AKKACONF=${CONF_DIR}/pekko.conf - MODULESCONF=${CONF_DIR}/modules.conf - MODULESHARDSCONF=${CONF_DIR}/module-shards.conf - - # Verify configuration files are present in expected location. - if [ ! -f ${AKKACONF} -o ! -f ${MODULESHARDSCONF} ]; then - # Check if the configuration files exist in the system - # directory, then copy them over. - ORIG_CONF_DIR=${CONTROLLER_DIR}/system/org/opendaylight/controller/sal-clustering-config - version=$(sed -n -e 's/.*\(.*\)<\/version>/\1/p' ${ORIG_CONF_DIR}/maven-metadata-local.xml) - ORIG_CONF_DIR=${ORIG_CONF_DIR}/${version} - ORIG_AKKA_CONF=sal-clustering-config-${version}-pekkoconf.xml - ORIG_MODULES_CONF=sal-clustering-config-${version}-moduleconf.xml - ORIG_MODULESHARDS_CONF=sal-clustering-config-${version}-moduleshardconf.xml - - if [ -f ${ORIG_CONF_DIR}/${ORIG_AKKA_CONF} -a \ - -f ${ORIG_CONF_DIR}/${ORIG_MODULES_CONF} -a \ - -f ${ORIG_CONF_DIR}/${ORIG_MODULESHARDS_CONF} ]; then - cat < - -EOF - - exit 1 -} - - -function end_banner -{ -cat <\(.*\)<\/version>/\1/p' ${ORIG_CONF_DIR}/maven-metadata-local.xml) - ORIG_CONF_DIR=${ORIG_CONF_DIR}/${version} - ORIG_CLUSTER_CONF=sal-clustering-config-${version}-datastore.cfg - - if [ -f ${ORIG_CONF_DIR}/${ORIG_CLUSTER_CONF} ]; then - cat < 4.0.0 - org.opendaylight.odlparent + org.opendaylight.controller karaf4-parent - 14.1.6 + 12.0.3 org.opendaylight.integration diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index 90e53845..bdb87f07 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -2,9 +2,9 @@ - org.opendaylight.odlparent + org.opendaylight.controller karaf4-parent - 14.1.6 + 12.0.3 -- 2.34.1 From 9f89e46d83e6dce83653cdc70775a77b3ccafaa2 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 19 Mar 2026 08:42:23 +0100 Subject: [PATCH 2/4] Reformat INFO.yaml Apply prettier fixes. Change-Id: I1f0beaf18fe9302420a5484304e8742103ccaf28 Signed-off-by: Anil Belur Signed-off-by: Anil Belur Signed-off-by: Robert Varga --- INFO.yaml | 96 +++++++++++++++++++++++++++---------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/INFO.yaml b/INFO.yaml index 1c5018a3..47684728 100644 --- a/INFO.yaml +++ b/INFO.yaml @@ -1,58 +1,58 @@ --- -project: 'integration' -project_creation_date: '2015-08-20' -project_category: '' -lifecycle_state: 'Incubation' +project: "integration" +project_creation_date: "2015-08-20" +project_category: "" +lifecycle_state: "Incubation" project_lead: &odl_integration_ptl - name: 'Luis Gomez' - email: 'ecelgp@gmail.com' - company: 'Lumina Networks' - id: 'ecelgp' - timezone: 'Americas/Los_Angeles' + name: "Luis Gomez" + email: "ecelgp@gmail.com" + company: "Lumina Networks" + id: "ecelgp" + timezone: "Americas/Los_Angeles" primary_contact: *odl_integration_ptl issue_tracking: - type: 'jira' - url: 'https://jira.opendaylight.org/projects/' - key: 'integration' + type: "jira" + url: "https://jira.opendaylight.org/projects/" + key: "integration" mailing_list: - type: 'groups.io' - url: 'integration-dev@lists.opendaylight.org' - tag: '[]' + type: "groups.io" + url: "integration-dev@lists.opendaylight.org" + tag: "[]" realtime_discussion: - type: 'irc' - server: 'freenode.net' - channel: '#opendaylight' + type: "irc" + server: "freenode.net" + channel: "#opendaylight" meetings: - - type: 'gotomeeting+irc' - agenda: 'https://wiki.opendaylight.org' - url: '' - server: 'freenode.net' - channel: '#opendaylight' - repeats: '' - time: '' + - type: "gotomeeting+irc" + agenda: "https://wiki.opendaylight.org" + url: "" + server: "freenode.net" + channel: "#opendaylight" + repeats: "" + time: "" repositories: - - integration + - integration committers: - - <<: *odl_integration_ptl - - name: 'Thanh Ha (zxiiro)' - email: 'zxiiro@gmail.com' - company: 'Lumina Networks' - id: 'zxiiro' - timezone: 'Americas/Toronto' - - name: 'Anil Belur' - email: 'abelur@linuxfoundation.org' - company: 'Linux Foundation' - id: 'askb' - timezone: 'Unknown/Unknown' - - name: 'Jamo Luhrsen' - email: 'jluhrsen@gmail.com' - company: 'Lumina Networks' - id: 'jluhrsen' - timezone: 'Americas/Los_Angeles' + - <<: *odl_integration_ptl + - name: "Thanh Ha (zxiiro)" + email: "zxiiro@gmail.com" + company: "Lumina Networks" + id: "zxiiro" + timezone: "Americas/Toronto" + - name: "Anil Belur" + email: "abelur@linuxfoundation.org" + company: "Linux Foundation" + id: "askb" + timezone: "Unknown/Unknown" + - name: "Jamo Luhrsen" + email: "jluhrsen@gmail.com" + company: "Lumina Networks" + id: "jluhrsen" + timezone: "Americas/Los_Angeles" tsc: - # yamllint disable rule:line-length - approval: 'https://meetings.opendaylight.org/meetings/opendaylight-meeting/2015/tsc/opendaylight-meeting-tsc.2015-08-20-17.00.html' - changes: - - type: '' - name: '' - link: '' + # yamllint disable rule:line-length + approval: "https://meetings.opendaylight.org/meetings/opendaylight-meeting/2015/tsc/opendaylight-meeting-tsc.2015-08-20-17.00.html" + changes: + - type: "" + name: "" + link: "" -- 2.34.1 From 3d449580d908bdb4079823d73adb94ecc15082bf Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 12 Mar 2026 17:45:23 +1000 Subject: [PATCH 3/4] ci: apply pre-commit formatting fixes Apply formatting fixes identified by pre-commit hooks: - trailing-whitespace: fix docs and xml files - end-of-file-fixer: fix missing newlines Change-Id: I58b008e1c4b473adf19bd5fd25ce583541d92c85 Signed-off-by: Anil Belur Signed-off-by: Anil Belur Signed-off-by: Robert Varga --- docs/platform-versions.rst | 2 -- karaf-scripts/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg | 2 +- onap-karaf/pom.xml | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst index 7fca08c8..7056cd70 100644 --- a/docs/platform-versions.rst +++ b/docs/platform-versions.rst @@ -47,5 +47,3 @@ Platform versions ${project}-artifacts are maven `bill of materials `__ (a.k.a. bom or BOM), whose use is strongly recommended to avoid versions mismatch across multiple dependencies in poms. - - diff --git a/karaf-scripts/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg b/karaf-scripts/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg index cdd58378..be7fa3eb 100644 --- a/karaf-scripts/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg +++ b/karaf-scripts/src/main/assembly/etc/org.ops4j.pax.url.mvn.cfg @@ -93,4 +93,4 @@ org.ops4j.pax.url.mvn.defaultRepositories=\ # org.ops4j.pax.url.mvn.repositories= -### ^^^ No remote repositories. This is the only ODL change compared to Karaf defaults. \ No newline at end of file +### ^^^ No remote repositories. This is the only ODL change compared to Karaf defaults. diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index bdb87f07..533202da 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -172,4 +172,3 @@ - -- 2.34.1 From 1e7631a75c4ad6ebd51c2fb35d933b0f2a33ae07 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Thu, 19 Mar 2026 07:49:56 +0000 Subject: [PATCH 4/4] Release Validate --- artifacts/all/pom.xml | 2 +- artifacts/distribution/pom.xml | 2 +- artifacts/pom.xml | 2 +- artifacts/upstream/all/pom.xml | 2 +- artifacts/upstream/artifacts/pom.xml | 2 +- artifacts/upstream/other/pom.xml | 2 +- artifacts/upstream/pom.xml | 2 +- artifacts/upstream/properties/pom.xml | 10 +++++----- features/pom.xml | 2 +- features/repos/index/pom.xml | 2 +- features/repos/pom.xml | 2 +- features/repos/test/pom.xml | 2 +- features/singles/odl-integration-all/pom.xml | 2 +- .../odl-integration-compatible-with-all/pom.xml | 2 +- features/singles/pom.xml | 2 +- karaf-scripts/pom.xml | 2 +- karaf/pom.xml | 6 +++--- onap-karaf/pom.xml | 2 +- pom.xml | 2 +- 19 files changed, 25 insertions(+), 25 deletions(-) diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml index 4abfacce..ef1261bf 100644 --- a/artifacts/all/pom.xml +++ b/artifacts/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration all-artifacts - 0.24.0-SNAPSHOT + 0.24.0 pom diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml index d059c325..f7a9b4b3 100644 --- a/artifacts/distribution/pom.xml +++ b/artifacts/distribution/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-artifacts - 0.24.0-SNAPSHOT + 0.24.0 pom diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 41ee9da3..1fdf3ae8 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration artifacts-aggregator - 0.24.0-SNAPSHOT + 0.24.0 pom diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml index 2311dc6e..0ab72017 100644 --- a/artifacts/upstream/all/pom.xml +++ b/artifacts/upstream/all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-all-artifacts - 0.24.0-SNAPSHOT + 0.24.0 pom diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml index 55a5a4e5..3154677a 100644 --- a/artifacts/upstream/artifacts/pom.xml +++ b/artifacts/upstream/artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.integration properties - 0.24.0-SNAPSHOT + 0.24.0 ../properties artifact-artifacts diff --git a/artifacts/upstream/other/pom.xml b/artifacts/upstream/other/pom.xml index af29b0d8..eb22eb60 100644 --- a/artifacts/upstream/other/pom.xml +++ b/artifacts/upstream/other/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.integration properties - 0.24.0-SNAPSHOT + 0.24.0 ../properties other-artifacts diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml index 9052792e..5a89a255 100644 --- a/artifacts/upstream/pom.xml +++ b/artifacts/upstream/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration upstream-aggregator - 0.24.0-SNAPSHOT + 0.24.0 pom diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml index 1d07f990..e079361c 100644 --- a/artifacts/upstream/properties/pom.xml +++ b/artifacts/upstream/properties/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration properties - 0.24.0-SNAPSHOT + 0.24.0 pom diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml index cc15bab8..4fcae45a 100644 --- a/features/repos/index/pom.xml +++ b/features/repos/index/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-index - 0.24.0-SNAPSHOT + 0.24.0 feature diff --git a/features/repos/pom.xml b/features/repos/pom.xml index c152c086..6da3e384 100644 --- a/features/repos/pom.xml +++ b/features/repos/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration repos-aggregator - 0.24.0-SNAPSHOT + 0.24.0 pom diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml index bda4b5d9..f159eeac 100644 --- a/features/repos/test/pom.xml +++ b/features/repos/test/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration features-test - 0.24.0-SNAPSHOT + 0.24.0 feature diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml index 6ba7ff44..d68eddc2 100644 --- a/features/singles/odl-integration-all/pom.xml +++ b/features/singles/odl-integration-all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration odl-integration-all - 0.24.0-SNAPSHOT + 0.24.0 feature diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml index 25e88784..0d6a920b 100644 --- a/features/singles/odl-integration-compatible-with-all/pom.xml +++ b/features/singles/odl-integration-compatible-with-all/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration odl-integration-compatible-with-all - 0.24.0-SNAPSHOT + 0.24.0 feature diff --git a/features/singles/pom.xml b/features/singles/pom.xml index 5bc5d311..0948337d 100644 --- a/features/singles/pom.xml +++ b/features/singles/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration singles-aggregator - 0.24.0-SNAPSHOT + 0.24.0 pom diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml index 8cfbcae3..b32ca3cd 100644 --- a/karaf-scripts/pom.xml +++ b/karaf-scripts/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration karaf-scripts - 0.24.0-SNAPSHOT + 0.24.0 jar ODL :: integration :: Karaf :: Scripts :: ${project.artifactId} The actual Karaf archive building sub-project. diff --git a/karaf/pom.xml b/karaf/pom.xml index 81996000..83437c41 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -18,7 +18,7 @@ org.opendaylight.integration karaf - 0.24.0-SNAPSHOT + 0.24.0 pom @@ -43,7 +43,7 @@ org.opendaylight.integration all-artifacts - 0.24.0-SNAPSHOT + 0.24.0 import pom @@ -97,7 +97,7 @@ org.opendaylight.integration karaf-scripts - 0.24.0-SNAPSHOT + 0.24.0 test diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml index 533202da..ea1bc1bc 100644 --- a/onap-karaf/pom.xml +++ b/onap-karaf/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.integration onap-karaf - 0.24.0-SNAPSHOT + 0.24.0 pom ODL :: integration :: ${project.artifactId} 4.0.0 diff --git a/pom.xml b/pom.xml index 8184e072..09044711 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.integration distribution-aggregator - 0.24.0-SNAPSHOT + 0.24.0 pom Integration/Distribution -- 2.34.1