Move network bind IPs out of compute.yaml
This patch moves the local bind host hiera data out of compute.yaml and into composable services. Change-Id: Iae4ca707c429cc8f5ec4d1d514ae7da0bf557dfd
This commit is contained in:
parent
95949a2975
commit
b31d80f74c
@ -433,9 +433,6 @@ resources:
|
||||
CloudDomain: {get_param: CloudDomain}
|
||||
NeutronPhysicalBridge: {get_param: HypervisorNeutronPhysicalBridge}
|
||||
NeutronPublicInterface: {get_param: HypervisorNeutronPublicInterface}
|
||||
# L3 HA and Failover is not relevant for Computes, should be removed
|
||||
NovaApiHost: {get_attr: [VipMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, NovaApiNetwork]}]}
|
||||
NovaPublicIP: {get_attr: [VipMap, net_ip_map, external]}
|
||||
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
|
||||
EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
|
||||
Hostname:
|
||||
|
@ -42,9 +42,6 @@ parameters:
|
||||
NodeIndex:
|
||||
type: number
|
||||
default: 0
|
||||
NovaApiHost:
|
||||
type: string
|
||||
default: '' # Has to be here because of the ignored empty value bug
|
||||
NovaComputeExtraConfig:
|
||||
default: {}
|
||||
description: |
|
||||
@ -54,9 +51,6 @@ parameters:
|
||||
NovaComputeIPs:
|
||||
default: {}
|
||||
type: json
|
||||
NovaPublicIP:
|
||||
type: string
|
||||
default: '' # Has to be here because of the ignored empty value bug
|
||||
ServiceNetMap:
|
||||
default: {}
|
||||
description: Mapping of service_name -> network name. Typically set
|
||||
@ -288,11 +282,6 @@ resources:
|
||||
mapped_data: {get_param: ExtraConfig}
|
||||
compute:
|
||||
mapped_data:
|
||||
nova_api_host: {get_input: nova_api_host}
|
||||
nova::compute::vncproxy_host: {get_input: nova_public_ip}
|
||||
nova::compute::vncserver_proxyclient_address: {get_input: nova_vnc_proxyclient_address}
|
||||
neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip}
|
||||
|
||||
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
|
||||
|
||||
NovaComputeDeployment:
|
||||
@ -303,10 +292,6 @@ resources:
|
||||
config: {get_resource: NovaComputeConfig}
|
||||
server: {get_resource: NovaCompute}
|
||||
input_values:
|
||||
nova_public_ip: {get_param: NovaPublicIP}
|
||||
nova_api_host: {get_param: NovaApiHost}
|
||||
nova_vnc_proxyclient_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaVncProxyNetwork]}]}
|
||||
neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]}
|
||||
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
|
||||
|
||||
# Resource for site-specific injection of root certificate
|
||||
|
@ -83,5 +83,12 @@ outputs:
|
||||
template: AGENT_EXTENSIONS
|
||||
params:
|
||||
AGENT_EXTENSIONS: {get_param: NeutronAgentExtensions}
|
||||
# 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
|
||||
neutron::agents::ml2::ovs::local_ip: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
|
||||
step_config: |
|
||||
include ::tripleo::profile::base::neutron::ovs
|
||||
|
@ -88,7 +88,14 @@ outputs:
|
||||
# example openvswitch.
|
||||
nova::compute::reserved_host_memory: 2048
|
||||
nova::compute::neutron::libvirt_vif_driver: {get_param: NovaComputeLibvirtVifDriver}
|
||||
|
||||
# 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
|
||||
nova::compute::vncserver_proxyclient_address: {get_param: [ServiceNetMap, NovaVncProxyNetwork]}
|
||||
nova::compute::vncproxy_host: {get_param: [EndpointMap, NovaPublic, host]}
|
||||
step_config: |
|
||||
# TODO(emilien): figure how to deal with libvirt profile.
|
||||
# We'll probably treat it like we do with Neutron plugins.
|
||||
|
Loading…
x
Reference in New Issue
Block a user