Merge "Make memcached port parameters globally available" into stable/train
This commit is contained in:
commit
8f3617044d
|
@ -221,16 +221,6 @@ outputs:
|
||||||
source: {get_param: MemcachedIpSubnet}
|
source: {get_param: MemcachedIpSubnet}
|
||||||
memcached::logstdout: true
|
memcached::logstdout: true
|
||||||
tripleo::profile::base::memcached::enable_internal_memcached_tls: {get_param: MemcachedTLS}
|
tripleo::profile::base::memcached::enable_internal_memcached_tls: {get_param: MemcachedTLS}
|
||||||
-
|
|
||||||
# NOTE: This config is necessary while there are still services
|
|
||||||
# consuming Memcached that do not support TLS. Once all services
|
|
||||||
# do support TLS, this config should be dropped.
|
|
||||||
if:
|
|
||||||
- enable_non_tls_port
|
|
||||||
- memcached_port: {get_param: MemcachedPort}
|
|
||||||
memcached_authtoken_port: 11211
|
|
||||||
- memcached_port: {get_param: MemcachedPort}
|
|
||||||
memcached_authtoken_port: {get_param: MemcachedPort}
|
|
||||||
-
|
-
|
||||||
if:
|
if:
|
||||||
- internal_tls_enabled
|
- internal_tls_enabled
|
||||||
|
@ -263,6 +253,16 @@ outputs:
|
||||||
- enable_non_tls_port
|
- enable_non_tls_port
|
||||||
- 11211
|
- 11211
|
||||||
- {get_param: MemcachedPort}
|
- {get_param: MemcachedPort}
|
||||||
|
global_config_settings:
|
||||||
|
# NOTE: This config is necessary while there are still services
|
||||||
|
# consuming Memcached that do not support TLS. Once all services
|
||||||
|
# do support TLS, this config should be dropped.
|
||||||
|
if:
|
||||||
|
- enable_non_tls_port
|
||||||
|
- memcached_port: {get_param: MemcachedPort}
|
||||||
|
memcached_authtoken_port: 11211
|
||||||
|
- memcached_port: {get_param: MemcachedPort}
|
||||||
|
memcached_authtoken_port: {get_param: MemcachedPort}
|
||||||
# BEGIN DOCKER SETTINGS
|
# BEGIN DOCKER SETTINGS
|
||||||
puppet_config:
|
puppet_config:
|
||||||
config_volume: 'memcached'
|
config_volume: 'memcached'
|
||||||
|
|
|
@ -5,6 +5,3 @@
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
MemcachedTLS: true
|
MemcachedTLS: true
|
||||||
MemcachedPort: 11212
|
MemcachedPort: 11212
|
||||||
ExtraConfig:
|
|
||||||
memcached_port: 11212
|
|
||||||
memcached_authtoken_port: 11211
|
|
||||||
|
|
Loading…
Reference in New Issue