Move Redis, Memcached, Sahara, OVS agent out of role templates
Change-Id: I99784b5cfbb741bfc6d1ce9b77e8acf6cf00e073 Related-Bug: 1604414
This commit is contained in:
parent
dd9c8d6e9c
commit
ff3924988a
@ -414,7 +414,6 @@ resources:
|
|||||||
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
|
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
|
||||||
glance_api_servers: { get_param: [EndpointMap, GlanceInternal, uri]}
|
glance_api_servers: { get_param: [EndpointMap, GlanceInternal, uri]}
|
||||||
neutron_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronApiNetwork]}]}
|
neutron_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronApiNetwork]}]}
|
||||||
neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]}
|
|
||||||
nova_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaApiNetwork]}]}
|
nova_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaApiNetwork]}]}
|
||||||
nova_metadata_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaMetadataNetwork]}]}
|
nova_metadata_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaMetadataNetwork]}]}
|
||||||
horizon_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HorizonNetwork]}]}
|
horizon_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HorizonNetwork]}]}
|
||||||
@ -430,10 +429,7 @@ resources:
|
|||||||
template: "NETWORK_subnet"
|
template: "NETWORK_subnet"
|
||||||
params:
|
params:
|
||||||
NETWORK: {get_param: [ServiceNetMap, HorizonNetwork]}
|
NETWORK: {get_param: [ServiceNetMap, HorizonNetwork]}
|
||||||
redis_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RedisNetwork]}]}
|
|
||||||
redis_vip: {get_param: RedisVirtualIP}
|
redis_vip: {get_param: RedisVirtualIP}
|
||||||
sahara_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SaharaApiNetwork]}]}
|
|
||||||
memcached_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]}
|
|
||||||
ironic_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, IronicApiNetwork]}]}
|
ironic_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, IronicApiNetwork]}]}
|
||||||
|
|
||||||
# Map heat metadata into hiera datafiles
|
# Map heat metadata into hiera datafiles
|
||||||
@ -494,7 +490,6 @@ resources:
|
|||||||
|
|
||||||
# Neutron
|
# Neutron
|
||||||
neutron::bind_host: {get_input: neutron_api_network}
|
neutron::bind_host: {get_input: neutron_api_network}
|
||||||
neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip}
|
|
||||||
neutron::agents::metadata::metadata_ip: {get_input: neutron_api_network}
|
neutron::agents::metadata::metadata_ip: {get_input: neutron_api_network}
|
||||||
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
|
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
|
||||||
snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
|
snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
|
||||||
@ -518,18 +513,13 @@ resources:
|
|||||||
horizon::bind_address: {get_input: horizon_network}
|
horizon::bind_address: {get_input: horizon_network}
|
||||||
horizon::keystone_url: {get_input: keystone_auth_uri}
|
horizon::keystone_url: {get_input: keystone_auth_uri}
|
||||||
|
|
||||||
# Sahara
|
|
||||||
sahara::host: {get_input: sahara_api_network}
|
|
||||||
|
|
||||||
# Redis
|
# Redis
|
||||||
redis::bind: {get_input: redis_network}
|
|
||||||
redis_vip: {get_input: redis_vip}
|
redis_vip: {get_input: redis_vip}
|
||||||
# Firewall
|
# Firewall
|
||||||
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_ipv6: {get_input: memcached_ipv6}
|
||||||
memcached::listen_ip: {get_input: memcached_network}
|
|
||||||
tripleo::haproxy::service_certificate: {get_attr: [NodeTLSData, deployed_ssl_certificate_path]}
|
tripleo::haproxy::service_certificate: {get_attr: [NodeTLSData, deployed_ssl_certificate_path]}
|
||||||
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
|
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
|
||||||
|
|
||||||
|
@ -32,6 +32,12 @@ outputs:
|
|||||||
redis::requirepass: {get_param: RedisPassword}
|
redis::requirepass: {get_param: RedisPassword}
|
||||||
redis::masterauth: {get_param: RedisPassword}
|
redis::masterauth: {get_param: RedisPassword}
|
||||||
redis::sentinel_auth_pass: {get_param: RedisPassword}
|
redis::sentinel_auth_pass: {get_param: RedisPassword}
|
||||||
|
# NOTE: bind IP is found in Heat replacing the network name with the local node IP
|
||||||
|
# for the given network; replacement examples (eg. for internal_api):
|
||||||
|
# internal_api -> IP
|
||||||
|
# internal_api_uri -> [IP]
|
||||||
|
# internal_api_subnet - > IP/CIDR
|
||||||
|
redis::bind: {get_param: [ServiceNetMap, RedisNetwork]}
|
||||||
redis::port: 6379
|
redis::port: 6379
|
||||||
redis::sentinel::master_name: '"%{hiera(\"bootstrap_nodeid\")}"'
|
redis::sentinel::master_name: '"%{hiera(\"bootstrap_nodeid\")}"'
|
||||||
redis::sentinel::redis_host: '"%{hiera(\"bootstrap_nodeid_ip\")}"'
|
redis::sentinel::redis_host: '"%{hiera(\"bootstrap_nodeid_ip\")}"'
|
||||||
|
@ -25,6 +25,12 @@ outputs:
|
|||||||
value:
|
value:
|
||||||
service_name: memcached
|
service_name: memcached
|
||||||
config_settings:
|
config_settings:
|
||||||
|
# NOTE: bind IP is found in Heat replacing the network name with the local node IP
|
||||||
|
# for the given network; replacement examples (eg. for internal_api):
|
||||||
|
# internal_api -> IP
|
||||||
|
# internal_api_uri -> [IP]
|
||||||
|
# internal_api_subnet - > IP/CIDR
|
||||||
|
memcached::listen_ip: {get_param: [ServiceNetMap, MemcachedNetwork]}
|
||||||
tripleo.memcached.firewall_rules:
|
tripleo.memcached.firewall_rules:
|
||||||
'121 memcached':
|
'121 memcached':
|
||||||
dport: 11211
|
dport: 11211
|
||||||
|
@ -54,6 +54,12 @@ outputs:
|
|||||||
sahara::keystone::auth::admin_url: {get_param: [EndpointMap, SaharaAdmin, uri]}
|
sahara::keystone::auth::admin_url: {get_param: [EndpointMap, SaharaAdmin, uri]}
|
||||||
sahara::keystone::auth::password: {get_param: SaharaPassword }
|
sahara::keystone::auth::password: {get_param: SaharaPassword }
|
||||||
sahara::keystone::auth::region: {get_param: KeystoneRegion}
|
sahara::keystone::auth::region: {get_param: KeystoneRegion}
|
||||||
|
# NOTE: bind IP is found in Heat replacing the network name with the local node IP
|
||||||
|
# for the given network; replacement examples (eg. for internal_api):
|
||||||
|
# internal_api -> IP
|
||||||
|
# internal_api_uri -> [IP]
|
||||||
|
# internal_api_subnet - > IP/CIDR
|
||||||
|
sahara::host: {get_param: [ServiceNetMap, SaharaApiNetwork]}
|
||||||
tripleo.sahara_api.firewall_rules:
|
tripleo.sahara_api.firewall_rules:
|
||||||
'132 sahara':
|
'132 sahara':
|
||||||
dport:
|
dport:
|
||||||
|
Loading…
Reference in New Issue
Block a user