diff --git a/manifest-generation/config-from-cf-internal.yml b/manifest-generation/config-from-cf-internal.yml index 88f1273b09..d15eae0496 100644 --- a/manifest-generation/config-from-cf-internal.yml +++ b/manifest-generation/config-from-cf-internal.yml @@ -7,6 +7,7 @@ config_from_cf: staging_upload_user: (( properties.cc.staging_upload_user )) staging_upload_password: (( properties.cc.staging_upload_password )) consul: + datacenter: (( properties.consul.agent.datacenter || "dc1" )) log_level: (( properties.consul.agent.log_level )) lan_servers: (( properties.consul.agent.servers.lan )) ca_cert: (( properties.consul.ca_cert )) @@ -48,6 +49,7 @@ properties: consul: agent: log_level: (( merge )) + datacenter: (( merge )) servers: lan: (( merge )) ca_cert: diff --git a/manifest-generation/config-from-cf.yml b/manifest-generation/config-from-cf.yml index 6e27b2b2e0..ff35146839 100644 --- a/manifest-generation/config-from-cf.yml +++ b/manifest-generation/config-from-cf.yml @@ -7,6 +7,7 @@ config_from_cf: staging_upload_user: (( merge )) staging_upload_password: (( merge )) consul: + datacenter: (( merge )) log_level: (( merge )) lan_servers: (( merge )) ca_cert: (( merge )) diff --git a/manifest-generation/diego.yml b/manifest-generation/diego.yml index 853b436366..1c4253ebd2 100644 --- a/manifest-generation/diego.yml +++ b/manifest-generation/diego.yml @@ -538,6 +538,7 @@ properties: # -- Property below is used by the consul_agent job from cf-release -- consul: agent: + datacenter: (( config_from_cf.consul.datacenter )) log_level: (( config_from_cf.consul.log_level )) servers: lan: (( config_from_cf.consul.lan_servers ))