configure horizon with memcached ipv6 when needed
* Add MemcachedIPv6 parameter * If MemcachedIPv6 is set at True, configure Horizon with Memcached IPv6 addresses. This patch is required to make Horizon working when running IPv6 networks. Change-Id: I752e727bfb9040b29f5d755f565fa6b54b9511c8
This commit is contained in:
parent
1dd6de571c
commit
aadb34dc02
|
@ -53,3 +53,5 @@ parameter_defaults:
|
||||||
NovaIPv6: True
|
NovaIPv6: True
|
||||||
# Enable IPv6 environment for RabbitMQ.
|
# Enable IPv6 environment for RabbitMQ.
|
||||||
RabbitIPv6: true
|
RabbitIPv6: true
|
||||||
|
# Enable IPv6 environment for Memcached.
|
||||||
|
MemcachedIPv6: true
|
||||||
|
|
|
@ -104,6 +104,10 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
constraints:
|
constraints:
|
||||||
- custom_constraint: nova.keypair
|
- custom_constraint: nova.keypair
|
||||||
|
MemcachedIPv6:
|
||||||
|
default: false
|
||||||
|
description: Enable IPv6 features in Memcached.
|
||||||
|
type: boolean
|
||||||
NeutronExternalNetworkBridge:
|
NeutronExternalNetworkBridge:
|
||||||
description: Name of bridge used for external network traffic.
|
description: Name of bridge used for external network traffic.
|
||||||
type: string
|
type: string
|
||||||
|
@ -939,6 +943,7 @@ resources:
|
||||||
KeystoneSSLCertificateKey: {get_param: KeystoneSSLCertificateKey}
|
KeystoneSSLCertificateKey: {get_param: KeystoneSSLCertificateKey}
|
||||||
KeystoneNotificationDriver: {get_param: KeystoneNotificationDriver}
|
KeystoneNotificationDriver: {get_param: KeystoneNotificationDriver}
|
||||||
KeystoneNotificationFormat: {get_param: KeystoneNotificationFormat}
|
KeystoneNotificationFormat: {get_param: KeystoneNotificationFormat}
|
||||||
|
MemcachedIPv6: {get_param: MemcachedIPv6}
|
||||||
MysqlClusterUniquePart: {get_attr: [MysqlClusterUniquePart, value]}
|
MysqlClusterUniquePart: {get_attr: [MysqlClusterUniquePart, value]}
|
||||||
MysqlInnodbBufferPoolSize: {get_param: MysqlInnodbBufferPoolSize}
|
MysqlInnodbBufferPoolSize: {get_param: MysqlInnodbBufferPoolSize}
|
||||||
MysqlMaxConnections: {get_param: MysqlMaxConnections}
|
MysqlMaxConnections: {get_param: MysqlMaxConnections}
|
||||||
|
|
|
@ -333,6 +333,10 @@ parameters:
|
||||||
default: false
|
default: false
|
||||||
description: Whether to manage IPtables rules.
|
description: Whether to manage IPtables rules.
|
||||||
type: boolean
|
type: boolean
|
||||||
|
MemcachedIPv6:
|
||||||
|
default: false
|
||||||
|
description: Enable IPv6 features in Memcached.
|
||||||
|
type: boolean
|
||||||
PurgeFirewallRules:
|
PurgeFirewallRules:
|
||||||
default: false
|
default: false
|
||||||
description: Whether IPtables rules should be purged before setting up the new ones.
|
description: Whether IPtables rules should be purged before setting up the new ones.
|
||||||
|
@ -1181,6 +1185,7 @@ resources:
|
||||||
nova_enable_db_purge: {get_param: NovaEnableDBPurge}
|
nova_enable_db_purge: {get_param: NovaEnableDBPurge}
|
||||||
nova_ipv6: {get_param: NovaIPv6}
|
nova_ipv6: {get_param: NovaIPv6}
|
||||||
corosync_ipv6: {get_param: CorosyncIPv6}
|
corosync_ipv6: {get_param: CorosyncIPv6}
|
||||||
|
memcached_ipv6: {get_param: MemcachedIPv6}
|
||||||
nova_password: {get_param: NovaPassword}
|
nova_password: {get_param: NovaPassword}
|
||||||
nova_dsn:
|
nova_dsn:
|
||||||
list_join:
|
list_join:
|
||||||
|
@ -1631,6 +1636,7 @@ resources:
|
||||||
tripleo::firewall::manage_firewall: {get_input: manage_firewall}
|
tripleo::firewall::manage_firewall: {get_input: manage_firewall}
|
||||||
tripleo::firewall::purge_firewall_rules: {get_input: purge_firewall_rules}
|
tripleo::firewall::purge_firewall_rules: {get_input: purge_firewall_rules}
|
||||||
# Misc
|
# Misc
|
||||||
|
memcached_ipv6: {get_input: memcached_ipv6}
|
||||||
memcached::listen_ip: {get_input: memcached_network}
|
memcached::listen_ip: {get_input: memcached_network}
|
||||||
neutron_public_interface_ip: {get_input: neutron_public_interface_ip}
|
neutron_public_interface_ip: {get_input: neutron_public_interface_ip}
|
||||||
ntp::servers: {get_input: ntp_servers}
|
ntp::servers: {get_input: ntp_servers}
|
||||||
|
|
|
@ -626,8 +626,15 @@ if hiera('step') >= 3 {
|
||||||
}
|
}
|
||||||
$neutron_options = {'profile_support' => $_profile_support }
|
$neutron_options = {'profile_support' => $_profile_support }
|
||||||
|
|
||||||
|
$memcached_ipv6 = hiera('memcached_ipv6', false)
|
||||||
|
if $memcached_ipv6 {
|
||||||
|
$horizon_memcached_servers = hiera('memcache_node_ips_v6', '[::1]')
|
||||||
|
} else {
|
||||||
|
$horizon_memcached_servers = hiera('memcache_node_ips', '127.0.0.1')
|
||||||
|
}
|
||||||
|
|
||||||
class { '::horizon':
|
class { '::horizon':
|
||||||
cache_server_ip => hiera('memcache_node_ips', '127.0.0.1'),
|
cache_server_ip => $horizon_memcached_servers,
|
||||||
neutron_options => $neutron_options,
|
neutron_options => $neutron_options,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1121,8 +1121,16 @@ if hiera('step') >= 3 {
|
||||||
$_profile_support = 'None'
|
$_profile_support = 'None'
|
||||||
}
|
}
|
||||||
$neutron_options = {'profile_support' => $_profile_support }
|
$neutron_options = {'profile_support' => $_profile_support }
|
||||||
|
|
||||||
|
$memcached_ipv6 = hiera('memcached_ipv6', false)
|
||||||
|
if $memcached_ipv6 {
|
||||||
|
$horizon_memcached_servers = hiera('memcache_node_ips_v6', '[::1]')
|
||||||
|
} else {
|
||||||
|
$horizon_memcached_servers = hiera('memcache_node_ips', '127.0.0.1')
|
||||||
|
}
|
||||||
|
|
||||||
class { '::horizon':
|
class { '::horizon':
|
||||||
cache_server_ip => hiera('memcache_node_ips', '127.0.0.1'),
|
cache_server_ip => $horizon_memcached_servers,
|
||||||
neutron_options => $neutron_options,
|
neutron_options => $neutron_options,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue