This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new a0b685439a NIFI-15140 Removed unused cluster.protocol.is.secure
property
a0b685439a is described below
commit a0b685439a21aad0875d9c2e57a8a45469d79267
Author: exceptionfactory <[email protected]>
AuthorDate: Sat Oct 25 17:33:09 2025 -0500
NIFI-15140 Removed unused cluster.protocol.is.secure property
- Removed documentation and example references to the unused application
property
Signed-off-by: Pierre Villard <[email protected]>
This closes #10465.
---
.../src/test/resources/conf/nifi.properties | 1 -
.../src/main/java/org/apache/nifi/util/NiFiProperties.java | 14 +++++++-------
.../resources/NiFiProperties/conf/nifi.blank.properties | 1 -
.../resources/NiFiProperties/conf/nifi.missing.properties | 1 -
.../src/test/resources/NiFiProperties/conf/nifi.properties | 1 -
nifi-docker/dockerhub/sh/secure.sh | 2 --
nifi-docker/dockerhub/sh/start.sh | 1 -
nifi-docs/src/main/asciidoc/administration-guide.adoc | 3 +--
.../src/test/resources/conf/nifi.properties | 1 -
.../src/test/resources/conf/nifi.properties | 1 -
.../src/test/resources/conf/nifi.properties | 1 -
.../src/test/resources/flowcontrollertest.nifi.properties | 1 -
.../src/test/resources/nifi-with-remote.properties | 1 -
.../resources/standardflowserializertest.nifi.properties | 1 -
.../resources/standardflowsynchronizerspec.nifi.properties | 1 -
.../resources/standardprocessschedulertest.nifi.properties | 1 -
.../resources/conf/nifi.nar_with_native_lib.properties | 1 -
.../resources/conf/nifi.nar_without_native_lib.properties | 1 -
.../src/test/resources/conf/nifi.properties | 1 -
.../src/test/resources/NarUnpacker/conf/nifi.properties | 1 -
.../src/test/resources/nifi.properties | 1 -
.../nifi-nar-utils/src/test/resources/nifi.properties | 1 -
.../nifi-framework/nifi-resources/pom.xml | 1 -
.../nifi-resources/src/main/resources/conf/nifi.properties | 1 -
.../nifi-site-to-site/src/test/resources/nifi.properties | 1 -
.../src/test/resources/site-to-site/nifi.properties | 1 -
.../test/resources/conf/clustered/node1/nifi.properties | 1 -
.../test/resources/conf/clustered/node2/nifi.properties | 1 -
.../src/test/resources/conf/default/nifi.properties | 1 -
.../src/test/resources/conf/pythonic/nifi.properties | 1 -
.../src/main/resources/classpath/overlay.properties | 1 -
31 files changed, 8 insertions(+), 39 deletions(-)
diff --git
a/minifi/minifi-integration-tests/src/test/resources/conf/nifi.properties
b/minifi/minifi-integration-tests/src/test/resources/conf/nifi.properties
index 2818a6a470..813f85003f 100644
--- a/minifi/minifi-integration-tests/src/test/resources/conf/nifi.properties
+++ b/minifi/minifi-integration-tests/src/test/resources/conf/nifi.properties
@@ -81,7 +81,6 @@ nifi.security.user.authorizer=
# cluster common properties (cluster manager and nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
nifi.cluster.protocol.socket.timeout=30 sec
nifi.cluster.protocol.connection.handshake.timeout=45 sec
# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties
must be configured #
diff --git
a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
index 051981efcc..b9456a98a0 100644
---
a/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
+++
b/nifi-commons/nifi-properties/src/main/java/org/apache/nifi/util/NiFiProperties.java
@@ -223,7 +223,6 @@ public class NiFiProperties extends ApplicationProperties {
// cluster common properties
public static final String CLUSTER_PROTOCOL_HEARTBEAT_INTERVAL =
"nifi.cluster.protocol.heartbeat.interval";
public static final String CLUSTER_PROTOCOL_HEARTBEAT_MISSABLE_MAX =
"nifi.cluster.protocol.heartbeat.missable.max";
- public static final String CLUSTER_PROTOCOL_IS_SECURE =
"nifi.cluster.protocol.is.secure";
public static final String CLUSTER_LEADER_ELECTION_IMPLEMENTATION =
"nifi.cluster.leader.election.implementation";
// cluster node properties
@@ -924,11 +923,12 @@ public class NiFiProperties extends ApplicationProperties
{
}
public String getClusterProtocolManagerToNodeApiScheme() {
- final String isSecureProperty =
getProperty(CLUSTER_PROTOCOL_IS_SECURE);
- if (Boolean.valueOf(isSecureProperty)) {
- return "https";
- } else {
+ final String httpsPort = getProperty(WEB_HTTPS_PORT);
+
+ if (httpsPort == null || httpsPort.isBlank()) {
return "http";
+ } else {
+ return "https";
}
}
@@ -1313,7 +1313,7 @@ public class NiFiProperties extends ApplicationProperties
{
port = getPort();
if (port == null) {
- throw new RuntimeException(String.format("The %s must be
specified if running in a cluster with %s set to false.", WEB_HTTP_PORT,
CLUSTER_PROTOCOL_IS_SECURE));
+ throw new IllegalStateException("Application property [%s]
must be specified".formatted(WEB_HTTP_PORT));
}
} else {
// get host
@@ -1326,7 +1326,7 @@ public class NiFiProperties extends ApplicationProperties
{
port = getSslPort();
if (port == null) {
- throw new RuntimeException(String.format("The %s must be
specified if running in a cluster with %s set to true.", WEB_HTTPS_PORT,
CLUSTER_PROTOCOL_IS_SECURE));
+ throw new IllegalStateException("Application property [%s]
must be specified".formatted(WEB_HTTPS_PORT));
}
}
diff --git
a/nifi-commons/nifi-properties/src/test/resources/NiFiProperties/conf/nifi.blank.properties
b/nifi-commons/nifi-properties/src/test/resources/NiFiProperties/conf/nifi.blank.properties
index f249f0f117..c78cf62675 100644
---
a/nifi-commons/nifi-properties/src/test/resources/NiFiProperties/conf/nifi.blank.properties
+++
b/nifi-commons/nifi-properties/src/test/resources/NiFiProperties/conf/nifi.blank.properties
@@ -80,7 +80,6 @@ nifi.security.user.authorizer=
# cluster common properties (cluster manager and nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
nifi.cluster.protocol.socket.timeout=30 sec
nifi.cluster.protocol.connection.handshake.timeout=45 sec
# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties
must be configured #
diff --git
a/nifi-commons/nifi-properties/src/test/resources/NiFiProperties/conf/nifi.missing.properties
b/nifi-commons/nifi-properties/src/test/resources/NiFiProperties/conf/nifi.missing.properties
index 5581182a08..9d1f2a5da4 100644
---
a/nifi-commons/nifi-properties/src/test/resources/NiFiProperties/conf/nifi.missing.properties
+++
b/nifi-commons/nifi-properties/src/test/resources/NiFiProperties/conf/nifi.missing.properties
@@ -78,7 +78,6 @@ nifi.security.user.authorizer=
# cluster common properties (cluster manager and nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
nifi.cluster.protocol.socket.timeout=30 sec
nifi.cluster.protocol.connection.handshake.timeout=45 sec
# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties
must be configured #
diff --git
a/nifi-commons/nifi-properties/src/test/resources/NiFiProperties/conf/nifi.properties
b/nifi-commons/nifi-properties/src/test/resources/NiFiProperties/conf/nifi.properties
index 54bd18bad7..d825fb82b5 100644
---
a/nifi-commons/nifi-properties/src/test/resources/NiFiProperties/conf/nifi.properties
+++
b/nifi-commons/nifi-properties/src/test/resources/NiFiProperties/conf/nifi.properties
@@ -81,7 +81,6 @@ nifi.security.user.authorizer=
# cluster common properties (cluster manager and nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
nifi.cluster.protocol.socket.timeout=30 sec
nifi.cluster.protocol.connection.handshake.timeout=45 sec
# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties
must be configured #
diff --git a/nifi-docker/dockerhub/sh/secure.sh
b/nifi-docker/dockerhub/sh/secure.sh
index 62b2eec092..9c81b632a5 100755
--- a/nifi-docker/dockerhub/sh/secure.sh
+++ b/nifi-docker/dockerhub/sh/secure.sh
@@ -60,8 +60,6 @@ prop_replace 'nifi.web.http.host' ''
prop_replace 'nifi.web.https.port' "${NIFI_WEB_HTTPS_PORT:-8443}"
prop_replace 'nifi.web.https.host' "${NIFI_WEB_HTTPS_HOST:-$HOSTNAME}"
prop_replace 'nifi.remote.input.secure' 'true'
-# Enable the property only for cluster install
-prop_replace 'nifi.cluster.protocol.is.secure' "${NIFI_CLUSTER_IS_NODE:-false}"
# Setup nifi-toolkit
prop_replace 'baseUrl'
"https://${NIFI_WEB_HTTPS_HOST:-$HOSTNAME}:${NIFI_WEB_HTTPS_PORT:-8443}";
${nifi_toolkit_props_file}
diff --git a/nifi-docker/dockerhub/sh/start.sh
b/nifi-docker/dockerhub/sh/start.sh
index c439459cdf..cb35e84f45 100755
--- a/nifi-docker/dockerhub/sh/start.sh
+++ b/nifi-docker/dockerhub/sh/start.sh
@@ -44,7 +44,6 @@ prop_replace 'nifi.web.proxy.host'
"${NIFI_WEB_PROXY_HOST}"
prop_replace 'nifi.remote.input.host'
"${NIFI_REMOTE_INPUT_HOST:-$HOSTNAME}"
prop_replace 'nifi.remote.input.socket.port'
"${NIFI_REMOTE_INPUT_SOCKET_PORT:-10000}"
prop_replace 'nifi.remote.input.secure' 'true'
-prop_replace 'nifi.cluster.protocol.is.secure' 'true'
# Set nifi-toolkit properties files and baseUrl
"${scripts_dir}/toolkit.sh"
diff --git a/nifi-docs/src/main/asciidoc/administration-guide.adoc
b/nifi-docs/src/main/asciidoc/administration-guide.adoc
index dbcb46a064..65502c3044 100644
--- a/nifi-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/administration-guide.adoc
@@ -320,7 +320,7 @@ configure the web server to WANT certificate base client
authentication. This wi
may be logging in with credentials. See <<user_authentication>> for more
details.
Now that the User Interface has been secured, we can easily secure
Site-to-Site connections and inner-cluster communications, as well. This is
-accomplished by setting the `nifi.remote.input.secure` and
`nifi.cluster.protocol.is.secure` properties, respectively, to `true`. These
communications
+accomplished by setting the `nifi.remote.input.secure` property to `true`.
These communications
will always REQUIRE two way SSL as the nodes will use their configured
keystore/truststore for authentication.
Automatic refreshing of NiFi's web SSL context factory can be enabled using
the following properties:
@@ -3595,7 +3595,6 @@ When setting up a NiFi cluster, these properties should
be configured the same w
|*Property*|*Description*
|`nifi.cluster.protocol.heartbeat.interval`|The interval at which nodes should
emit heartbeats to the Cluster Coordinator. The default value is `5 sec`.
|`nifi.cluster.protocol.heartbeat.missable.max`|Maximum number of heartbeats a
Cluster Coordinator can miss for a node in the cluster before the Cluster
Coordinator updates the node status to Disconnected. The default value is `8`.
-|`nifi.cluster.protocol.is.secure`|This indicates whether cluster
communications are secure. The default value is `false`.
|====
[[cluster_node_properties]]
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/resources/conf/nifi.properties
b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/resources/conf/nifi.properties
index def6c62fd8..15ded64c47 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/resources/conf/nifi.properties
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/test/resources/conf/nifi.properties
@@ -94,7 +94,6 @@ nifi.security.default.user.roles=
# cluster common properties (cluster manager and nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=1 secs
-nifi.cluster.protocol.is.secure=false
nifi.cluster.protocol.socket.timeout=30 sec
nifi.cluster.protocol.connection.handshake.timeout=45 sec
# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties
must be configured #
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/resources/conf/nifi.properties
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/resources/conf/nifi.properties
index 80a1824777..f1464660cc 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/resources/conf/nifi.properties
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/resources/conf/nifi.properties
@@ -75,7 +75,6 @@ nifi.security.user.authorizer=
# cluster common properties (cluster manager and nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
nifi.cluster.protocol.socket.timeout=30 sec
nifi.cluster.protocol.connection.handshake.timeout=45 sec
# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties
must be configured #
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/conf/nifi.properties
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/conf/nifi.properties
index fb62969d79..1314224af2 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/conf/nifi.properties
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/conf/nifi.properties
@@ -78,7 +78,6 @@ nifi.security.user.authorizer=
# cluster common properties (cluster manager and nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
nifi.cluster.protocol.socket.timeout=30 sec
nifi.cluster.protocol.connection.handshake.timeout=45 sec
# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties
must be configured #
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/flowcontrollertest.nifi.properties
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/flowcontrollertest.nifi.properties
index dbfa709897..cbf6ad10e2 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/flowcontrollertest.nifi.properties
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/flowcontrollertest.nifi.properties
@@ -90,7 +90,6 @@ nifi.security.user.authorizer=
# cluster common properties (cluster manager and nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
nifi.cluster.protocol.socket.timeout=30 sec
nifi.cluster.protocol.connection.handshake.timeout=45 sec
# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties
must be configured #
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/nifi-with-remote.properties
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/nifi-with-remote.properties
index 1db95158bd..96dd22cbb7 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/nifi-with-remote.properties
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/nifi-with-remote.properties
@@ -79,7 +79,6 @@ nifi.security.user.authorizer=
# cluster common properties (cluster manager and nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
nifi.cluster.protocol.socket.timeout=30 sec
nifi.cluster.protocol.connection.handshake.timeout=45 sec
# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties
must be configured #
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/standardflowserializertest.nifi.properties
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/standardflowserializertest.nifi.properties
index 80e79b7332..e1d02fcf25 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/standardflowserializertest.nifi.properties
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/standardflowserializertest.nifi.properties
@@ -84,7 +84,6 @@ nifi.security.user.authorizer=
# cluster common properties (cluster manager and nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
nifi.cluster.protocol.socket.timeout=30 sec
nifi.cluster.protocol.connection.handshake.timeout=45 sec
# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties
must be configured #
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/standardflowsynchronizerspec.nifi.properties
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/standardflowsynchronizerspec.nifi.properties
index 00aeeaa36b..32828af3e5 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/standardflowsynchronizerspec.nifi.properties
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/standardflowsynchronizerspec.nifi.properties
@@ -84,7 +84,6 @@ nifi.security.user.authorizer=
# cluster common properties (cluster manager and nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
nifi.cluster.protocol.socket.timeout=30 sec
nifi.cluster.protocol.connection.handshake.timeout=45 sec
# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties
must be configured #
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/standardprocessschedulertest.nifi.properties
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/standardprocessschedulertest.nifi.properties
index 8208c72e88..51ad9f3698 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/standardprocessschedulertest.nifi.properties
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/resources/standardprocessschedulertest.nifi.properties
@@ -84,7 +84,6 @@ nifi.security.user.authorizer=
# cluster common properties (cluster manager and nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
nifi.cluster.protocol.socket.timeout=30 sec
nifi.cluster.protocol.connection.handshake.timeout=45 sec
# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties
must be configured #
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/resources/conf/nifi.nar_with_native_lib.properties
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/resources/conf/nifi.nar_with_native_lib.properties
index 4d442677b9..8b4ca5505a 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/resources/conf/nifi.nar_with_native_lib.properties
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/resources/conf/nifi.nar_with_native_lib.properties
@@ -77,7 +77,6 @@ nifi.security.user.authorizer=
# cluster common properties (cluster manager and nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
nifi.cluster.protocol.socket.timeout=30 sec
nifi.cluster.protocol.connection.handshake.timeout=45 sec
# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties
must be configured #
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/resources/conf/nifi.nar_without_native_lib.properties
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/resources/conf/nifi.nar_without_native_lib.properties
index 9e28ca7d91..91fb352ca9 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/resources/conf/nifi.nar_without_native_lib.properties
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/resources/conf/nifi.nar_without_native_lib.properties
@@ -77,7 +77,6 @@ nifi.security.user.authorizer=
# cluster common properties (cluster manager and nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
nifi.cluster.protocol.socket.timeout=30 sec
nifi.cluster.protocol.connection.handshake.timeout=45 sec
# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties
must be configured #
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/resources/conf/nifi.properties
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/resources/conf/nifi.properties
index fe1a1a0787..c3f86bd4c0 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/resources/conf/nifi.properties
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/src/test/resources/conf/nifi.properties
@@ -77,7 +77,6 @@ nifi.security.user.authorizer=
# cluster common properties (cluster manager and nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
nifi.cluster.protocol.socket.timeout=30 sec
nifi.cluster.protocol.connection.handshake.timeout=45 sec
# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties
must be configured #
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/test/resources/NarUnpacker/conf/nifi.properties
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/test/resources/NarUnpacker/conf/nifi.properties
index d2b348820a..fd2d90e564 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/test/resources/NarUnpacker/conf/nifi.properties
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/test/resources/NarUnpacker/conf/nifi.properties
@@ -77,7 +77,6 @@ nifi.security.user.authorizer=
# cluster common properties (cluster manager and nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
nifi.cluster.protocol.socket.timeout=30 sec
nifi.cluster.protocol.connection.handshake.timeout=45 sec
# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties
must be configured #
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/test/resources/nifi.properties
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/test/resources/nifi.properties
index 960c93ac54..a5fd048107 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/test/resources/nifi.properties
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/test/resources/nifi.properties
@@ -145,7 +145,6 @@ nifi.security.user.login.identity.provider=
# cluster common properties (all nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
# cluster node properties (only configure for cluster nodes) #
nifi.cluster.is.node=false
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/resources/nifi.properties
b/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/resources/nifi.properties
index d379987a03..e98d0bd5ab 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/resources/nifi.properties
+++
b/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/resources/nifi.properties
@@ -145,7 +145,6 @@ nifi.security.user.login.identity.provider=
# cluster common properties (all nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
# cluster node properties (only configure for cluster nodes) #
nifi.cluster.is.node=false
diff --git a/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
b/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
index 259bbcfd16..9cde3f11d4 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
+++ b/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
@@ -194,7 +194,6 @@
<!-- nifi.properties: cluster common properties (cluster manager and
nodes must have same values) -->
<nifi.cluster.protocol.heartbeat.interval>5
sec</nifi.cluster.protocol.heartbeat.interval>
<nifi.cluster.protocol.heartbeat.missable.max>8</nifi.cluster.protocol.heartbeat.missable.max>
-
<nifi.cluster.protocol.is.secure>false</nifi.cluster.protocol.is.secure>
<!-- nifi.properties: cluster node properties (only configure for
cluster nodes) -->
<nifi.cluster.is.node>false</nifi.cluster.is.node>
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties
b/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties
index 59a6eda4cc..c958410839 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties
+++
b/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/nifi.properties
@@ -256,7 +256,6 @@
nifi.security.user.saml.http.client.read.timeout=${nifi.security.user.saml.http.
# cluster common properties (all nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=${nifi.cluster.protocol.heartbeat.interval}
nifi.cluster.protocol.heartbeat.missable.max=${nifi.cluster.protocol.heartbeat.missable.max}
-nifi.cluster.protocol.is.secure=${nifi.cluster.protocol.is.secure}
# cluster node properties (only configure for cluster nodes) #
nifi.cluster.is.node=${nifi.cluster.is.node}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/nifi.properties
b/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/nifi.properties
index 1ccd5ea2a4..b2dd0ce946 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/nifi.properties
+++
b/nifi-framework-bundle/nifi-framework/nifi-site-to-site/src/test/resources/nifi.properties
@@ -55,7 +55,6 @@ nifi.security.user.authorizer=
# cluster common properties (cluster manager and nodes must have same values) #
nifi.cluster.protocol.heartbeat.tick.seconds=10
-nifi.cluster.protocol.is.secure=true
nifi.cluster.protocol.socket.timeout.ms=30000
nifi.cluster.protocol.connection.handshake.timeout.seconds=45
# if multicast is used, then nifi.cluster.protocol.multicast.xxx properties
must be configured #
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/site-to-site/nifi.properties
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/site-to-site/nifi.properties
index b0546cb524..5e7681b17b 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/site-to-site/nifi.properties
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/site-to-site/nifi.properties
@@ -135,7 +135,6 @@
nifi.security.user.login.identity.provider=${nifi.security.user.login.identity.p
# cluster common properties (all nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=${nifi.cluster.protocol.heartbeat.interval}
-nifi.cluster.protocol.is.secure=${nifi.cluster.protocol.is.secure}
# cluster node properties (only configure for cluster nodes) #
nifi.cluster.is.node=${nifi.cluster.is.node}
diff --git
a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node1/nifi.properties
b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node1/nifi.properties
index 0083410bb9..c138b956f0 100644
---
a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node1/nifi.properties
+++
b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node1/nifi.properties
@@ -195,7 +195,6 @@ nifi.security.user.oidc.preferred.jwsalgorithm=
# cluster common properties (all nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=2 sec
-nifi.cluster.protocol.is.secure=true
# cluster node properties (only configure for cluster nodes) #
nifi.cluster.is.node=true
diff --git
a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node2/nifi.properties
b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node2/nifi.properties
index 843bd4b884..e6cc024595 100644
---
a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node2/nifi.properties
+++
b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node2/nifi.properties
@@ -195,7 +195,6 @@ nifi.security.user.oidc.preferred.jwsalgorithm=
# cluster common properties (all nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=2 sec
-nifi.cluster.protocol.is.secure=true
# cluster node properties (only configure for cluster nodes) #
nifi.cluster.is.node=true
diff --git
a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/default/nifi.properties
b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/default/nifi.properties
index a74f60723f..fb115fa813 100644
---
a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/default/nifi.properties
+++
b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/default/nifi.properties
@@ -196,7 +196,6 @@ nifi.security.user.oidc.preferred.jwsalgorithm=
# cluster common properties (all nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=true
# cluster node properties (only configure for cluster nodes) #
nifi.cluster.is.node=false
diff --git
a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/pythonic/nifi.properties
b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/pythonic/nifi.properties
index 779354310b..628b454cb8 100644
---
a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/pythonic/nifi.properties
+++
b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/pythonic/nifi.properties
@@ -200,7 +200,6 @@ nifi.security.user.oidc.preferred.jwsalgorithm=
# cluster common properties (all nodes must have same values) #
nifi.cluster.protocol.heartbeat.interval=5 sec
-nifi.cluster.protocol.is.secure=false
# cluster node properties (only configure for cluster nodes) #
nifi.cluster.is.node=false
diff --git
a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/classpath/overlay.properties
b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/classpath/overlay.properties
index 2084bf3663..dabff920ab 100644
---
a/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/classpath/overlay.properties
+++
b/nifi-toolkit/nifi-toolkit-assembly/src/main/resources/classpath/overlay.properties
@@ -35,7 +35,6 @@ nifi.cluster.node.protocol.port=11443
# Properties to set verbatim
nifi.remote.input.secure=true
-nifi.cluster.protocol.is.secure=true
nifi.web.http.host=
nifi.web.http.port=
\ No newline at end of file
