Use heat inputs for network port settings
This patch updates the controller and compute roles so that we use get_input in the software configuration instead of calling get_attr/get_param there. Change-Id: I1dc11987b4ea3c37775b14fbdddb75588499e9bb
This commit is contained in:
Dan Prince
parent
a2e6eb9f06
commit
78c5ba2c01
|
|
@ -365,7 +365,7 @@ resources:
|
|||
neutron::rabbit_port: {get_input: rabbit_client_port}
|
||||
neutron_flat_networks: {get_input: neutron_flat_networks}
|
||||
neutron_host: {get_input: neutron_host}
|
||||
neutron::agents::ml2::ovs::local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronLocalIp]}]}
|
||||
neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip}
|
||||
|
||||
neutron_tenant_network_type: {get_input: neutron_tenant_network_type}
|
||||
neutron_tunnel_types: {get_input: neutron_tunnel_types}
|
||||
|
|
@ -421,7 +421,7 @@ resources:
|
|||
- {get_param: GlancePort}
|
||||
neutron_flat_networks: {get_param: NeutronFlatNetworks}
|
||||
neutron_host: {get_param: NeutronHost}
|
||||
neutron_local_ip: {get_attr: [NovaCompute, networks, ctlplane, 0]}
|
||||
neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronLocalIp]}]}
|
||||
neutron_tenant_network_type: {get_param: NeutronNetworkType}
|
||||
neutron_tunnel_types: {get_param: NeutronTunnelTypes}
|
||||
neutron_network_vlan_ranges: {get_param: NeutronNetworkVLANRanges}
|
||||
|
|
|
|||
|
|
@ -688,6 +688,27 @@ resources:
|
|||
swift_min_part_hours: {get_param: SwiftMinPartHours}
|
||||
swift_mount_check: {get_param: SwiftMountCheck}
|
||||
enable_package_install: {get_param: EnablePackageInstall}
|
||||
swift_proxy_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftProxyNetwork]}]}
|
||||
swift_management_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]}
|
||||
cinder_iscsi_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]}
|
||||
cinder_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderApiNetwork]}]}
|
||||
glance_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
|
||||
glance_registry_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceRegistryNetwork]}]}
|
||||
heat_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]}
|
||||
heat_api_cloudwatch_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiCloudwatchNetwork]}]}
|
||||
heat_api_cfn_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiCfnNetwork]}]}
|
||||
keystone_public_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
|
||||
keystone_admin_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
|
||||
mongo_db_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MongoDbNetwork]}]}
|
||||
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, NeutronLocalIp]}]}
|
||||
ceilometer_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]}
|
||||
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]}]}
|
||||
horizon_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HorizonNetwork]}]}
|
||||
rabbitmq_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RabbitMqNetwork]}]}
|
||||
redis_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RedisNetwork]}]}
|
||||
memcached_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]}
|
||||
|
||||
# Map heat metadata into hiera datafiles
|
||||
ControllerConfig:
|
||||
|
|
@ -724,10 +745,10 @@ resources:
|
|||
hacluster_pwd: {get_input: pcsd_password}
|
||||
|
||||
# Swift
|
||||
swift::proxy::proxy_local_net_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftProxyNetwork]}]}
|
||||
swift::proxy::proxy_local_net_ip: {get_input: swift_proxy_network}
|
||||
swift::proxy::authtoken::auth_uri: {get_input: keystone_auth_uri}
|
||||
swift::proxy::authtoken::identity_uri: {get_input: keystone_identity_uri}
|
||||
swift::storage::all::storage_local_net_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]}
|
||||
swift::storage::all::storage_local_net_ip: {get_input: swift_management_network}
|
||||
swift::swift_hash_suffix: {get_input: swift_hash_suffix}
|
||||
swift::proxy::authtoken::admin_password: {get_input: swift_password}
|
||||
tripleo::ringbuilder::part_power: {get_input: swift_part_power}
|
||||
|
|
@ -743,12 +764,12 @@ resources:
|
|||
cinder_enable_rbd_backend: {get_input: cinder_enable_rbd_backend}
|
||||
cinder_lvm_loop_device_size: {get_input: cinder_lvm_loop_device_size}
|
||||
cinder_iscsi_helper: {get_input: cinder_iscsi_helper}
|
||||
cinder_iscsi_ip_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]}
|
||||
cinder_iscsi_ip_address: {get_input: cinder_iscsi_network}
|
||||
cinder::database_connection: {get_input: cinder_dsn}
|
||||
cinder::api::keystone_password: {get_input: cinder_password}
|
||||
cinder::api::auth_uri: {get_input: keystone_auth_uri}
|
||||
cinder::api::identity_uri: {get_input: keystone_identity_uri}
|
||||
cinder::api::bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderApiNetwork]}]}
|
||||
cinder::api::bind_host: {get_input: cinder_api_network}
|
||||
cinder::rabbit_userid: {get_input: rabbit_username}
|
||||
cinder::rabbit_password: {get_input: rabbit_password}
|
||||
cinder::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
|
||||
|
|
@ -758,10 +779,10 @@ resources:
|
|||
|
||||
# Glance
|
||||
glance::api::bind_port: {get_input: glance_port}
|
||||
glance::api::bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
|
||||
glance::api::bind_host: {get_input: glance_api_network}
|
||||
glance::api::auth_uri: {get_input: keystone_auth_uri}
|
||||
glance::api::identity_uri: {get_input: keystone_identity_uri}
|
||||
glance::api::registry_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceRegistryNetwork]}]}
|
||||
glance::api::registry_host: {get_input: glance_registry_network}
|
||||
glance::api::keystone_password: {get_input: glance_password}
|
||||
glance::api::debug: {get_input: debug}
|
||||
# used to construct glance_api_servers
|
||||
|
|
@ -795,9 +816,9 @@ resources:
|
|||
heat::auth_uri: {get_input: keystone_auth_uri}
|
||||
heat::identity_uri: {get_input: keystone_identity_uri}
|
||||
heat::keystone_password: {get_input: heat_password}
|
||||
heat::api::bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]}
|
||||
heat::api_cloudwatch::bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiCloudwatchNetwork]}]}
|
||||
heat::api_cfn::bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiCfnNetwork]}]}
|
||||
heat::api::bind_host: {get_input: heat_api_network}
|
||||
heat::api_cloudwatch::bind_host: {get_input: heat_api_cloudwatch_network}
|
||||
heat::api_cfn::bind_host: {get_input: heat_api_cfn_network}
|
||||
heat::database_connection: {get_input: heat_dsn}
|
||||
heat::instance_user: heat-admin
|
||||
heat::debug: {get_input: debug}
|
||||
|
|
@ -810,11 +831,11 @@ resources:
|
|||
keystone_ssl_certificate: {get_input: keystone_ssl_certificate}
|
||||
keystone_ssl_certificate_key: {get_input: keystone_ssl_certificate_key}
|
||||
keystone::database_connection: {get_input: keystone_dsn}
|
||||
keystone::public_bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
|
||||
keystone::admin_bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
|
||||
keystone::public_bind_host: {get_input: keystone_public_api_network}
|
||||
keystone::admin_bind_host: {get_input: keystone_admin_api_network}
|
||||
keystone::debug: {get_input: debug}
|
||||
# MongoDB
|
||||
mongodb::server::bind_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MongoDbNetwork]}]}
|
||||
mongodb::server::bind_ip: {get_input: mongo_db_network}
|
||||
# MySQL
|
||||
admin_password: {get_input: admin_password}
|
||||
enable_galera: {get_input: enable_galera}
|
||||
|
|
@ -825,7 +846,7 @@ resources:
|
|||
mysql_cluster_name: {get_input: mysql_cluster_name}
|
||||
|
||||
# Neutron
|
||||
neutron::bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronApiNetwork]}]}
|
||||
neutron::bind_host: {get_input: neutron_api_network}
|
||||
neutron::rabbit_password: {get_input: rabbit_password}
|
||||
neutron::rabbit_user: {get_input: rabbit_user}
|
||||
neutron::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
|
||||
|
|
@ -835,7 +856,7 @@ resources:
|
|||
neutron::server::identity_uri: {get_input: keystone_identity_uri}
|
||||
neutron::server::database_connection: {get_input: neutron_dsn}
|
||||
neutron::agents::ml2::ovs::enable_tunneling: {get_input: neutron_enable_tunneling}
|
||||
neutron::agents::ml2::ovs::local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronLocalIp]}]}
|
||||
neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip}
|
||||
neutron_flat_networks: {get_input: neutron_flat_networks}
|
||||
neutron::agents::metadata::shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
|
||||
neutron::agents::metadata::metadata_ip: {get_input: controller_virtual_ip}
|
||||
|
|
@ -866,7 +887,7 @@ resources:
|
|||
ceilometer::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
|
||||
ceilometer::rabbit_port: {get_input: rabbit_client_port}
|
||||
ceilometer::debug: {get_input: debug}
|
||||
ceilometer::api::host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CeilometerApiNetwork]}]}
|
||||
ceilometer::api::host: {get_input: ceilometer_api_network}
|
||||
ceilometer::api::keystone_password: {get_input: ceilometer_password}
|
||||
ceilometer::api::keystone_auth_uri: {get_input: keystone_auth_uri}
|
||||
ceilometer::api::keystone_identity_uri: {get_input: keystone_identity_uri}
|
||||
|
|
@ -882,8 +903,8 @@ resources:
|
|||
nova::debug: {get_input: debug}
|
||||
nova::api::auth_uri: {get_input: keystone_auth_uri}
|
||||
nova::api::identity_uri: {get_input: keystone_identity_uri}
|
||||
nova::api::api_bind_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaApiNetwork]}]}
|
||||
nova::api::metadata_listen: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaMetadataNetwork]}]}
|
||||
nova::api::api_bind_address: {get_input: nova_api_network}
|
||||
nova::api::metadata_listen: {get_input: nova_metadata_network}
|
||||
nova::api::admin_password: {get_input: nova_password}
|
||||
nova::database_connection: {get_input: nova_dsn}
|
||||
nova::api::neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
|
||||
|
|
@ -894,16 +915,16 @@ resources:
|
|||
# Horizon
|
||||
horizon::django_debug: {get_input: debug}
|
||||
horizon::secret_key: {get_input: horizon_secret}
|
||||
horizon::bind_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HorizonNetwork]}]}
|
||||
horizon::bind_address: {get_input: horizon_network}
|
||||
horizon::keystone_url: {get_input: keystone_auth_uri}
|
||||
|
||||
# Rabbit
|
||||
rabbitmq::node_ip_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RabbitMqNetwork]}]}
|
||||
rabbitmq::node_ip_address: {get_input: rabbitmq_network}
|
||||
rabbitmq::erlang_cookie: {get_input: rabbit_cookie}
|
||||
# Redis
|
||||
redis::bind: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RedisNetwork]}]}
|
||||
redis::bind: {get_input: redis_network}
|
||||
# Misc
|
||||
memcached::listen_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]}
|
||||
memcached::listen_ip: {get_input: memcached_network}
|
||||
neutron_public_interface_ip: {get_input: neutron_public_interface_ip}
|
||||
ntp::servers: {get_input: ntp_servers}
|
||||
control_virtual_interface: {get_input: control_virtual_interface}
|
||||
|
|
|
|||
Loading…
Reference in New Issue