Make "no_advertise" cluster property configurable

[cloudfoundry#25](cloudfoundry#25) [cloudfoundry/routing-release#185](cloudfoundry/routing-release#185)
orange-cloudfoundry · Oct 14, 2020 · b8c113d · b8c113d
1 parent ccd5eb3
commit b8c113d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/jobs/nats-tls/spec b/jobs/nats-tls/spec
@@ -69,6 +69,9 @@ properties:
   nats.prof_port:
     description: "Port for pprof. 0 means disabled."
     default: 0
+  nats.no_advertise:
+    description: "When configured to true, this nats server will not be advertised to any nats clients."
+    default: true
 
   nats.external.tls.ca:
     description: "Certificate of the CA for publisher/subscriber traffic. In PEM format."

diff --git a/jobs/nats-tls/templates/nats-tls.conf.erb b/jobs/nats-tls/templates/nats-tls.conf.erb
@@ -72,7 +72,7 @@ tls {
 }
 
 cluster {
-  no_advertise: true
+  no_advertise: <%= p("nats.no_advertise") %>
   host: "<%= p("nats.cluster_host", spec.address) %>"
   port: <%= p("nats.cluster_port") %>
 

diff --git a/jobs/nats/spec b/jobs/nats/spec
@@ -64,7 +64,9 @@ properties:
   nats.prof_port:
     description: "Port for pprof. 0 means disabled."
     default: 0
-
+  nats.no_advertise:
+    description: "When configured to true, this nats server will not be advertised to any nats clients. This is defaulted to true for backwards compatability."
+    default: true
   nats.internal.tls.enabled:
     description: "Enable mutually authenticated TLS for NATS cluster-internal traffic."
     default: false

diff --git a/jobs/nats/templates/nats.conf.erb b/jobs/nats/templates/nats.conf.erb
@@ -57,7 +57,7 @@ authorization {
 }
 
 cluster {
-  no_advertise: true
+  no_advertise: <%= p("nats.no_advertise") %>
   host: "<%= p("nats.cluster_host", spec.address) %>"
   port: <%= p("nats.cluster_port") %>
 

diff --git a/spec/nats-tls/nats_tls_config_spec.rb b/spec/nats-tls/nats_tls_config_spec.rb
@@ -18,6 +18,7 @@ module Bosh::Template::Test
             'cluster_port' => 4223,
             'authorization_timeout' => 15,
             'machines' => nil,
+            'no_advertise' => false,
             'debug' => false,
             'trace' => false,
             'monitor_port' => 0,
@@ -110,6 +111,7 @@ module Bosh::Template::Test
 \}
 
 cluster \{
+  no_advertise: false
   host: "10.0.0.1"
   port: 4223
 
@@ -186,6 +188,7 @@ module Bosh::Template::Test
 \}
 
 cluster \{
+  no_advertise: false
   host: "10.0.0.1"
   port: 4223
 

diff --git a/spec/nats/nats_config_spec.rb b/spec/nats/nats_config_spec.rb
@@ -18,6 +18,7 @@ module Bosh::Template::Test
             'cluster_port' => 4223,
             'authorization_timeout' => 15,
             'machines' => nil,
+            'no_advertise' => true,
             'debug' => false,
             'trace' => false,
             'monitor_port' => 0,
@@ -88,6 +89,7 @@ module Bosh::Template::Test
 \}
 
 cluster \{
+  no_advertise: true
   host: "10.0.0.1"
   port: 4223
 
@@ -149,6 +151,7 @@ module Bosh::Template::Test
 \}
 
 cluster \{
+  no_advertise: true
   host: "10.0.0.1"
   port: 4223