diff options
| -rw-r--r-- | network/service_net_map.yaml | 2 | ||||
| -rw-r--r-- | overcloud.j2.yaml | 84 | ||||
| -rw-r--r-- | puppet/services/neutron-base.yaml | 7 |
3 files changed, 21 insertions, 72 deletions
diff --git a/network/service_net_map.yaml b/network/service_net_map.yaml index 5d3f087d..a61af1b3 100644 --- a/network/service_net_map.yaml +++ b/network/service_net_map.yaml @@ -30,6 +30,8 @@ parameters: ManilaApiNetwork: internal_api NeutronApiNetwork: internal_api HeatApiNetwork: internal_api + HeatApiCfnNetwork: internal_api + HeatApiCloudwatchNetwork: internal_api NovaApiNetwork: internal_api NovaMetadataNetwork: internal_api NovaVncProxyNetwork: internal_api diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index ec6f052d..d9dcaee9 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -282,6 +282,20 @@ resources: config: {get_resource: AllNodesValidationConfig} servers: {get_attr: [{{role.name}}, attributes, nova_server_resource]} + {{role.name}}IpListMap: + type: OS::TripleO::Network::Ports::NetIpListMap + properties: + ControlPlaneIpList: {get_attr: [{{role.name}}, ip_address]} + ExternalIpList: {get_attr: [{{role.name}}, external_ip_address]} + InternalApiIpList: {get_attr: [{{role.name}}, internal_api_ip_address]} + StorageIpList: {get_attr: [{{role.name}}, storage_ip_address]} + StorageMgmtIpList: {get_attr: [{{role.name}}, storage_mgmt_ip_address]} + TenantIpList: {get_attr: [{{role.name}}, tenant_ip_address]} + ManagementIpList: {get_attr: [{{role.name}}, management_ip_address]} + EnabledServices: {get_attr: [{{role.name}}ServiceChain, role_data, service_names]} + ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]} + ServiceHostnameList: {get_attr: [{{role.name}}, hostname]} + {% endfor %} Controller: @@ -435,76 +449,6 @@ resources: ServiceNames: {get_attr: [CephStorageServiceChain, role_data, service_names]} MonitoringSubscriptions: {get_attr: [CephStorageServiceChain, role_data, monitoring_subscriptions]} - ControllerIpListMap: - type: OS::TripleO::Network::Ports::NetIpListMap - properties: - ControlPlaneIpList: {get_attr: [Controller, ip_address]} - ExternalIpList: {get_attr: [Controller, external_ip_address]} - InternalApiIpList: {get_attr: [Controller, internal_api_ip_address]} - StorageIpList: {get_attr: [Controller, storage_ip_address]} - StorageMgmtIpList: {get_attr: [Controller, storage_mgmt_ip_address]} - TenantIpList: {get_attr: [Controller, tenant_ip_address]} - ManagementIpList: {get_attr: [Controller, management_ip_address]} - EnabledServices: {get_attr: [ControllerServiceChain, role_data, service_names]} - ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]} - ServiceHostnameList: {get_attr: [Controller, hostname]} - - ComputeIpListMap: - type: OS::TripleO::Network::Ports::NetIpListMap - properties: - ControlPlaneIpList: {get_attr: [Compute, ip_address]} - ExternalIpList: {get_attr: [Compute, external_ip_address]} - InternalApiIpList: {get_attr: [Compute, internal_api_ip_address]} - StorageIpList: {get_attr: [Compute, storage_ip_address]} - StorageMgmtIpList: {get_attr: [Compute, storage_mgmt_ip_address]} - TenantIpList: {get_attr: [Compute, tenant_ip_address]} - ManagementIpList: {get_attr: [Compute, management_ip_address]} - EnabledServices: {get_attr: [ComputeServiceChain, role_data, service_names]} - ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]} - ServiceHostnameList: {get_attr: [Compute, hostname]} - - BlockStorageIpListMap: - type: OS::TripleO::Network::Ports::NetIpListMap - properties: - ControlPlaneIpList: {get_attr: [BlockStorage, ip_address]} - ExternalIpList: {get_attr: [BlockStorage, external_ip_address]} - InternalApiIpList: {get_attr: [BlockStorage, internal_api_ip_address]} - StorageIpList: {get_attr: [BlockStorage, storage_ip_address]} - StorageMgmtIpList: {get_attr: [BlockStorage, storage_mgmt_ip_address]} - TenantIpList: {get_attr: [BlockStorage, tenant_ip_address]} - ManagementIpList: {get_attr: [BlockStorage, management_ip_address]} - EnabledServices: {get_attr: [BlockStorageServiceChain, role_data, service_names]} - ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]} - ServiceHostnameList: {get_attr: [BlockStorage, hostname]} - - ObjectStorageIpListMap: - type: OS::TripleO::Network::Ports::NetIpListMap - properties: - ControlPlaneIpList: {get_attr: [ObjectStorage, ip_address]} - ExternalIpList: {get_attr: [ObjectStorage, external_ip_address]} - InternalApiIpList: {get_attr: [ObjectStorage, internal_api_ip_address]} - StorageIpList: {get_attr: [ObjectStorage, storage_ip_address]} - StorageMgmtIpList: {get_attr: [ObjectStorage, storage_mgmt_ip_address]} - TenantIpList: {get_attr: [ObjectStorage, tenant_ip_address]} - ManagementIpList: {get_attr: [ObjectStorage, management_ip_address]} - EnabledServices: {get_attr: [ObjectStorageServiceChain, role_data, service_names]} - ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]} - ServiceHostnameList: {get_attr: [ObjectStorage, hostname]} - - CephStorageIpListMap: - type: OS::TripleO::Network::Ports::NetIpListMap - properties: - ControlPlaneIpList: {get_attr: [CephStorage, ip_address]} - ExternalIpList: {get_attr: [CephStorage, external_ip_address]} - InternalApiIpList: {get_attr: [CephStorage, internal_api_ip_address]} - StorageIpList: {get_attr: [CephStorage, storage_ip_address]} - StorageMgmtIpList: {get_attr: [CephStorage, storage_mgmt_ip_address]} - TenantIpList: {get_attr: [CephStorage, tenant_ip_address]} - ManagementIpList: {get_attr: [CephStorage, management_ip_address]} - EnabledServices: {get_attr: [CephStorageServiceChain, role_data, service_names]} - ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]} - ServiceHostnameList: {get_attr: [CephStorage, hostname]} - allNodesConfig: type: OS::TripleO::AllNodes::SoftwareConfig properties: diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml index 4eb417c0..32d50d41 100644 --- a/puppet/services/neutron-base.yaml +++ b/puppet/services/neutron-base.yaml @@ -50,13 +50,16 @@ parameters: to false may result in configuration remnants after updates/upgrades. NeutronGlobalPhysnetMtu: type: number - default: 1500 + default: 1496 description: | MTU of the underlying physical network. Neutron uses this value to calculate MTU for all virtual network components. For flat and VLAN networks, neutron uses this value without modification. For overlay networks such as VXLAN, neutron automatically subtracts the overlay - protocol overhead from this value. + protocol overhead from this value. The default value of 1496 is + currently in effect to compensate for some additional overhead when + deploying with some network configurations (e.g. network isolation over + single network interfaces) ServiceNetMap: default: {} description: Mapping of service_name -> network name. Typically set |