Merge "Fall back service_net_map to ctlplane" into stable/rocky
This commit is contained in:
Zuul
Gerrit Code Review
commit
cc53e25a79
|
|
@ -1,3 +1,24 @@
|
||||||
|
{%- set _service_nets = {} -%}
|
||||||
|
{%- for network in networks if network.enabled|default(true) -%}
|
||||||
|
{%- if network.name == 'InternalApi' -%}
|
||||||
|
{%- set _service_nets = _service_nets.update({'internal_api': 'internal_api'}) -%}
|
||||||
|
{%- endif -%}
|
||||||
|
{%- if network.name == 'External' -%}
|
||||||
|
{%- set _service_nets = _service_nets.update({'external': 'external'}) -%}
|
||||||
|
{%- endif -%}
|
||||||
|
{%- if network.name == 'Tenant' -%}
|
||||||
|
{%- set _service_nets = _service_nets.update({'tenant': 'tenant'}) -%}
|
||||||
|
{%- endif -%}
|
||||||
|
{%- if network.name == 'Storage' -%}
|
||||||
|
{%- set _service_nets = _service_nets.update({'storage': 'storage'}) -%}
|
||||||
|
{%- endif -%}
|
||||||
|
{%- if network.name == 'StorageMgmt' -%}
|
||||||
|
{%- set _service_nets = _service_nets.update({'storage_mgmt': 'storage_mgmt'}) -%}
|
||||||
|
{%- endif -%}
|
||||||
|
{%- if network.name == 'StorageNFS' -%}
|
||||||
|
{%- set _service_nets = _service_nets.update({'storage_nfs': 'storage_nfs'}) -%}
|
||||||
|
{%- endif -%}
|
||||||
|
{%- endfor -%}
|
||||||
heat_template_version: rocky
|
heat_template_version: rocky
|
||||||
|
|
||||||
description: >
|
description: >
|
||||||
|
|
@ -24,75 +45,77 @@ parameters:
|
||||||
# Note the values in this map are replaced by *NetName
|
# Note the values in this map are replaced by *NetName
|
||||||
# to allow for sane defaults when the network names are
|
# to allow for sane defaults when the network names are
|
||||||
# overridden.
|
# overridden.
|
||||||
ApacheNetwork: internal_api
|
ApacheNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
NeutronTenantNetwork: tenant
|
NeutronTenantNetwork: {{ _service_nets.get('tenant', 'ctlplane') }}
|
||||||
AodhApiNetwork: internal_api
|
AodhApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
PankoApiNetwork: internal_api
|
PankoApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
BarbicanApiNetwork: internal_api
|
BarbicanApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
GnocchiApiNetwork: internal_api
|
GnocchiApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
MongodbNetwork: internal_api
|
MongodbNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
CinderApiNetwork: internal_api
|
CinderApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
CinderIscsiNetwork: storage
|
CinderIscsiNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
|
||||||
CongressApiNetwork: internal_api
|
CongressApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
GlanceApiNetwork: internal_api
|
GlanceApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
IronicApiNetwork: ctlplane
|
IronicApiNetwork: ctlplane
|
||||||
IronicNetwork: ctlplane
|
IronicNetwork: ctlplane
|
||||||
IronicInspectorNetwork: ctlplane
|
IronicInspectorNetwork: ctlplane
|
||||||
KeystoneAdminApiNetwork: ctlplane # allows undercloud to config endpoints
|
KeystoneAdminApiNetwork: ctlplane # allows undercloud to config endpoints
|
||||||
KeystonePublicApiNetwork: internal_api
|
KeystonePublicApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
ManilaApiNetwork: internal_api
|
ManilaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
MetricsQdrNetwork: internal_api
|
MetricsQdrNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
NeutronApiNetwork: internal_api
|
NeutronApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
OctaviaApiNetwork: internal_api
|
OctaviaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
HeatApiNetwork: internal_api
|
HeatApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
HeatApiCfnNetwork: internal_api
|
HeatApiCfnNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
HeatApiCloudwatchNetwork: internal_api
|
HeatApiCloudwatchNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
NovaApiNetwork: internal_api
|
NovaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
NovaPlacementNetwork: internal_api
|
NovaPlacementNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
NovaMetadataNetwork: internal_api
|
NovaMetadataNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
NovaVncProxyNetwork: internal_api
|
NovaVncProxyNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
NovaLibvirtNetwork: internal_api
|
NovaLibvirtNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
NovajoinNetwork: internal_api
|
NovajoinNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
Ec2ApiNetwork: internal_api
|
Ec2ApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
Ec2ApiMetadataNetwork: internal_api
|
Ec2ApiMetadataNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
TackerApiNetwork: internal_api
|
TackerApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
SwiftStorageNetwork: storage_mgmt
|
SwiftStorageNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }}
|
||||||
SwiftProxyNetwork: storage
|
SwiftProxyNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
|
||||||
SaharaApiNetwork: internal_api
|
SaharaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
HorizonNetwork: internal_api
|
HorizonNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
MemcachedNetwork: internal_api
|
MemcachedNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
OsloMessagingRpcNetwork: internal_api
|
OsloMessagingRpcNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
OsloMessagingNotifyNetwork: internal_api
|
OsloMessagingNotifyNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
RabbitmqNetwork: internal_api
|
RabbitmqNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
QdrNetwork: internal_api
|
QdrNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
RedisNetwork: internal_api
|
RedisNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
GaneshaNetwork: storage_nfs
|
GaneshaNetwork: {{ _service_nets.get('storage_nfs', 'ctlplane') }}
|
||||||
MysqlNetwork: internal_api
|
MysqlNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
SnmpdNetwork: ctrlplane
|
SnmpdNetwork: ctlplane
|
||||||
CephClusterNetwork: storage_mgmt
|
CephClusterNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }}
|
||||||
CephMonNetwork: storage
|
CephMonNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
|
||||||
CephRgwNetwork: storage
|
CephRgwNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
|
||||||
PublicNetwork: external
|
PublicNetwork: {{ _service_nets.get('external', 'ctlplane') }}
|
||||||
OpendaylightApiNetwork: internal_api
|
OpendaylightApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
OvnDbsNetwork: internal_api
|
OvnDbsNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
MistralApiNetwork: internal_api
|
MistralApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
ZaqarApiNetwork: internal_api
|
ZaqarApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
DockerRegistryNetwork: ctlplane
|
DockerRegistryNetwork: ctlplane
|
||||||
PacemakerRemoteNetwork: internal_api
|
PacemakerRemoteNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
TripleoUINetwork: internal_api
|
TripleoUINetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
DesignateApiNetwork: internal_api
|
DesignateApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
BINDNetwork: external
|
BINDNetwork: {{ _service_nets.get('external', 'ctlplane') }}
|
||||||
# We special-case the default ResolveNetwork for the CephStorage role
|
EtcdNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
# for backwards compatibility, all other roles default to internal_api
|
OpenshiftMasterNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
CephStorageHostnameResolveNetwork: storage
|
OpenshiftInfraNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
EtcdNetwork: internal_api
|
|
||||||
OpenshiftMasterNetwork: internal_api
|
|
||||||
OpenshiftInfraNetwork: internal_api
|
|
||||||
# HaproxyNetwork currently only controls the haproxy.stats network binding
|
# HaproxyNetwork currently only controls the haproxy.stats network binding
|
||||||
HaproxyNetwork: ctlplane
|
HaproxyNetwork: ctlplane
|
||||||
{% for role in roles if role.name != 'CephStorage' %}
|
# We special-case the default ResolveNetwork for the Ceph roles
|
||||||
{{role.name}}HostnameResolveNetwork: internal_api
|
# for backwards compatibility, all other roles default to internal_api
|
||||||
{% endfor %}
|
{%- for role in roles if role.name.startswith('Ceph') %}
|
||||||
|
{{role.name}}HostnameResolveNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
|
||||||
|
{%- endfor %}
|
||||||
|
{%- for role in roles if not role.name.startswith('Ceph') %}
|
||||||
|
{{role.name}}HostnameResolveNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
|
{%- endfor %}
|
||||||
description: Mapping of service_name -> network name. Typically set
|
description: Mapping of service_name -> network name. Typically set
|
||||||
via parameter_defaults in the resource registry.
|
via parameter_defaults in the resource registry.
|
||||||
type: json
|
type: json
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue