Make many networking parameters consistent
These are mostly the low hanging fruit that only required a few minor changes to fix. There are more that require a lot of changes or might be more controversial that will be done later. Change-Id: I55cebc92ef37a3bb167f5fae0debe77339395e62 Partial-Bug: 1700664
This commit is contained in:
parent
4502b7cba6
commit
c05e72cd72
@ -39,7 +39,7 @@ parameters:
|
|||||||
description: Ip allocation pool range for the management network.
|
description: Ip allocation pool range for the management network.
|
||||||
type: json
|
type: json
|
||||||
ManagementInterfaceDefaultRoute:
|
ManagementInterfaceDefaultRoute:
|
||||||
default: null
|
default: unset
|
||||||
description: The default route of the management network.
|
description: The default route of the management network.
|
||||||
type: string
|
type: string
|
||||||
|
|
||||||
|
@ -9,8 +9,8 @@ parameters:
|
|||||||
description: Name of the service to lookup
|
description: Name of the service to lookup
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
NetworkName:
|
NetworkName: # Here for compatibility with isolated networks
|
||||||
description: # Here for compatibility with isolated networks
|
description: Name of the network where the VIP will be created
|
||||||
default: ctlplane
|
default: ctlplane
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -6,7 +6,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
ExternalNetName:
|
ExternalNetName:
|
||||||
description: Name of the external neutron network
|
description: The name of the external network.
|
||||||
default: external
|
default: external
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -5,7 +5,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
ExternalNetName:
|
ExternalNetName:
|
||||||
description: Name of the external network
|
description: The name of the external network.
|
||||||
default: external
|
default: external
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -6,7 +6,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
ExternalNetName:
|
ExternalNetName:
|
||||||
description: Name of the external network
|
description: The name of the external network.
|
||||||
default: external
|
default: external
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -6,7 +6,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
ExternalNetName:
|
ExternalNetName:
|
||||||
description: Name of the external neutron network
|
description: The name of the external network.
|
||||||
default: external
|
default: external
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -5,7 +5,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
InternalApiNetName:
|
InternalApiNetName:
|
||||||
description: Name of the internal API neutron network
|
description: The name of the internal API network.
|
||||||
default: internal_api
|
default: internal_api
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -5,7 +5,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
InternalApiNetName:
|
InternalApiNetName:
|
||||||
description: Name of the internal API network
|
description: The name of the internal API network.
|
||||||
default: internal_api
|
default: internal_api
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -6,7 +6,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
InternalApiNetName:
|
InternalApiNetName:
|
||||||
description: Name of the internal API network
|
description: The name of the internal API network.
|
||||||
default: internal_api
|
default: internal_api
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -5,7 +5,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
InternalApiNetName:
|
InternalApiNetName:
|
||||||
description: Name of the internal API neutron network
|
description: The name of the internal API network.
|
||||||
default: internal_api
|
default: internal_api
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -6,7 +6,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
ManagementNetName:
|
ManagementNetName:
|
||||||
description: Name of the management neutron network
|
description: The name of the management network.
|
||||||
default: management
|
default: management
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -5,7 +5,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
ManagementNetName:
|
ManagementNetName:
|
||||||
description: Name of the management network
|
description: The name of the management network.
|
||||||
default: management
|
default: management
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -6,7 +6,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
ManagementNetName:
|
ManagementNetName:
|
||||||
description: Name of the management network
|
description: The name of the management network.
|
||||||
default: management
|
default: management
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -6,7 +6,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
ManagementNetName:
|
ManagementNetName:
|
||||||
description: Name of the management neutron network
|
description: The name of the management network.
|
||||||
default: management
|
default: management
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -14,6 +14,7 @@ parameters:
|
|||||||
ExternalIpSubnet:
|
ExternalIpSubnet:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
|
description: IP address/subnet on the external network
|
||||||
ExternalIpUri:
|
ExternalIpUri:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
@ -24,6 +25,7 @@ parameters:
|
|||||||
InternalApiIpSubnet:
|
InternalApiIpSubnet:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
|
description: IP address/subnet on the internal API network
|
||||||
InternalApiIpUri:
|
InternalApiIpUri:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
@ -34,6 +36,7 @@ parameters:
|
|||||||
StorageIpSubnet:
|
StorageIpSubnet:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
|
description: IP address/subnet on the storage network
|
||||||
StorageIpUri:
|
StorageIpUri:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
@ -44,6 +47,7 @@ parameters:
|
|||||||
StorageMgmtIpSubnet:
|
StorageMgmtIpSubnet:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
|
description: IP address/subnet on the storage mgmt network
|
||||||
StorageMgmtIpUri:
|
StorageMgmtIpUri:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
@ -54,6 +58,7 @@ parameters:
|
|||||||
TenantIpSubnet:
|
TenantIpSubnet:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
|
description: IP address/subnet on the tenant network
|
||||||
TenantIpUri:
|
TenantIpUri:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
|
@ -27,24 +27,28 @@ parameters:
|
|||||||
ExternalIpUri:
|
ExternalIpUri:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
|
description: IP address with brackets in case of IPv6
|
||||||
InternalApiIp:
|
InternalApiIp:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
InternalApiIpUri:
|
InternalApiIpUri:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
|
description: IP address with brackets in case of IPv6
|
||||||
StorageIp:
|
StorageIp:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
StorageIpUri:
|
StorageIpUri:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
|
description: IP address with brackets in case of IPv6
|
||||||
StorageMgmtIp:
|
StorageMgmtIp:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
StorageMgmtIpUri:
|
StorageMgmtIpUri:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
|
description: IP address with brackets in case of IPv6
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
net_ip_map:
|
net_ip_map:
|
||||||
|
@ -27,24 +27,28 @@ parameters:
|
|||||||
ExternalIpUri:
|
ExternalIpUri:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
|
description: IP address with brackets in case of IPv6
|
||||||
InternalApiIp:
|
InternalApiIp:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
InternalApiIpUri:
|
InternalApiIpUri:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
|
description: IP address with brackets in case of IPv6
|
||||||
StorageIp:
|
StorageIp:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
StorageIpUri:
|
StorageIpUri:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
|
description: IP address with brackets in case of IPv6
|
||||||
StorageMgmtIp:
|
StorageMgmtIp:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
StorageMgmtIpUri:
|
StorageMgmtIpUri:
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
|
description: IP address with brackets in case of IPv6
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
net_ip_map:
|
net_ip_map:
|
||||||
|
@ -12,19 +12,21 @@ parameters:
|
|||||||
description: IP address on the control plane
|
description: IP address on the control plane
|
||||||
type: string
|
type: string
|
||||||
ControlPlaneNetwork:
|
ControlPlaneNetwork:
|
||||||
description: Name of the control plane network
|
description: The name of the undercloud Neutron control plane
|
||||||
default: ctlplane
|
default: ctlplane
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
description: Name of the port
|
description: Name of the port
|
||||||
default: ''
|
default: ''
|
||||||
type: string
|
type: string
|
||||||
NetworkName:
|
NetworkName: # Here for compatibility with vip.yaml
|
||||||
description: # Here for compatibility with vip.yaml
|
description: Name of the network where the VIP will be created
|
||||||
default: ''
|
default: ctlplane
|
||||||
type: string
|
type: string
|
||||||
FixedIPs:
|
FixedIPs:
|
||||||
description: # Here for compatibility with vip.yaml
|
description: >
|
||||||
|
Control the IP allocation for the VIP port. E.g.
|
||||||
|
[{'ip_address':'1.2.3.4'}]
|
||||||
default: []
|
default: []
|
||||||
type: json
|
type: json
|
||||||
ControlPlaneSubnetCidr: # Override this via parameter_defaults
|
ControlPlaneSubnetCidr: # Override this via parameter_defaults
|
||||||
|
@ -5,7 +5,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
StorageNetName:
|
StorageNetName:
|
||||||
description: Name of the storage neutron network
|
description: The name of the storage network.
|
||||||
default: storage
|
default: storage
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -5,7 +5,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
StorageNetName:
|
StorageNetName:
|
||||||
description: Name of the storage network
|
description: The name of the storage network.
|
||||||
default: storage
|
default: storage
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -6,7 +6,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
StorageNetName:
|
StorageNetName:
|
||||||
description: Name of the storage network
|
description: The name of the storage network.
|
||||||
default: storage
|
default: storage
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -5,7 +5,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
StorageMgmtNetName:
|
StorageMgmtNetName:
|
||||||
description: Name of the storage_mgmt API neutron network
|
description: The name of the Storage management network.
|
||||||
default: storage_mgmt
|
default: storage_mgmt
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -5,7 +5,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
StorageMgmtNetName:
|
StorageMgmtNetName:
|
||||||
description: Name of the storage MGMT network
|
description: The name of the Storage management network.
|
||||||
default: storage_mgmt
|
default: storage_mgmt
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
@ -26,7 +26,7 @@ parameters:
|
|||||||
type: number
|
type: number
|
||||||
StorageMgmtNetCidr:
|
StorageMgmtNetCidr:
|
||||||
default: '172.16.3.0/24'
|
default: '172.16.3.0/24'
|
||||||
description: Cidr for the storage MGMT network.
|
description: Cidr for the storage management network.
|
||||||
type: string
|
type: string
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
|
@ -6,7 +6,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
StorageMgmtNetName:
|
StorageMgmtNetName:
|
||||||
description: Name of the storage MGMT network
|
description: The name of the Storage management network.
|
||||||
default: storage_mgmt
|
default: storage_mgmt
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
@ -27,7 +27,7 @@ parameters:
|
|||||||
type: number
|
type: number
|
||||||
StorageMgmtNetCidr:
|
StorageMgmtNetCidr:
|
||||||
default: 'fd00:fd00:fd00:4000::/64'
|
default: 'fd00:fd00:fd00:4000::/64'
|
||||||
description: Cidr for the storage MGMT network.
|
description: Cidr for the storage management network.
|
||||||
type: string
|
type: string
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
|
@ -5,7 +5,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
StorageMgmtNetName:
|
StorageMgmtNetName:
|
||||||
description: Name of the storage_mgmt API neutron network
|
description: The name of the Storage management network.
|
||||||
default: storage_mgmt
|
default: storage_mgmt
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -5,7 +5,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
StorageNetName:
|
StorageNetName:
|
||||||
description: Name of the storage neutron network
|
description: The name of the storage network.
|
||||||
default: storage
|
default: storage
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -5,7 +5,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
TenantNetName:
|
TenantNetName:
|
||||||
description: Name of the tenant neutron network
|
description: The name of the tenant network.
|
||||||
default: tenant
|
default: tenant
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -5,7 +5,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
TenantNetName:
|
TenantNetName:
|
||||||
description: Name of the tenant network
|
description: The name of the tenant network.
|
||||||
default: tenant
|
default: tenant
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -5,7 +5,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
TenantNetName:
|
TenantNetName:
|
||||||
description: Name of the tenant network
|
description: The name of the tenant network.
|
||||||
default: tenant
|
default: tenant
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -5,7 +5,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
TenantNetName:
|
TenantNetName:
|
||||||
description: Name of the tenant neutron network
|
description: The name of the tenant network.
|
||||||
default: tenant
|
default: tenant
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
|
@ -11,7 +11,7 @@ parameters:
|
|||||||
type: string
|
type: string
|
||||||
NetworkName:
|
NetworkName:
|
||||||
description: Name of the network where the VIP will be created
|
description: Name of the network where the VIP will be created
|
||||||
default: internal_api
|
default: ctlplane
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
description: Name of the port
|
description: Name of the port
|
||||||
|
@ -11,7 +11,7 @@ parameters:
|
|||||||
type: string
|
type: string
|
||||||
NetworkName:
|
NetworkName:
|
||||||
description: Name of the network where the VIP will be created
|
description: Name of the network where the VIP will be created
|
||||||
default: internal_api
|
default: ctlplane
|
||||||
type: string
|
type: string
|
||||||
PortName:
|
PortName:
|
||||||
description: Name of the port
|
description: Name of the port
|
||||||
|
@ -89,7 +89,7 @@ parameters:
|
|||||||
description: Neutron ID or name for ctlplane network.
|
description: Neutron ID or name for ctlplane network.
|
||||||
NeutronPublicInterface:
|
NeutronPublicInterface:
|
||||||
default: nic1
|
default: nic1
|
||||||
description: What interface to bridge onto br-ex for network nodes.
|
description: Which interface to add to the NeutronPhysicalBridge.
|
||||||
type: string
|
type: string
|
||||||
PublicVirtualFixedIPs:
|
PublicVirtualFixedIPs:
|
||||||
default: []
|
default: []
|
||||||
|
@ -31,7 +31,7 @@ parameters:
|
|||||||
via parameter_defaults in the resource registry.
|
via parameter_defaults in the resource registry.
|
||||||
type: json
|
type: json
|
||||||
NeutronMetadataProxySharedSecret:
|
NeutronMetadataProxySharedSecret:
|
||||||
description: Metadata Secret
|
description: Shared secret to prevent spoofing
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
ContrailVrouterPhysicalInterface:
|
ContrailVrouterPhysicalInterface:
|
||||||
|
@ -31,8 +31,9 @@ parameters:
|
|||||||
via parameter_defaults in the resource registry.
|
via parameter_defaults in the resource registry.
|
||||||
type: json
|
type: json
|
||||||
NeutronMetadataProxySharedSecret:
|
NeutronMetadataProxySharedSecret:
|
||||||
description: Metadata Secret
|
description: Shared secret to prevent spoofing
|
||||||
type: string
|
type: string
|
||||||
|
hidden: true
|
||||||
ContrailVrouterPhysicalInterface:
|
ContrailVrouterPhysicalInterface:
|
||||||
default: 'eth0'
|
default: 'eth0'
|
||||||
description: vRouter physical interface
|
description: vRouter physical interface
|
||||||
|
@ -31,7 +31,7 @@ parameters:
|
|||||||
via parameter_defaults in the resource registry.
|
via parameter_defaults in the resource registry.
|
||||||
type: json
|
type: json
|
||||||
NeutronMetadataProxySharedSecret:
|
NeutronMetadataProxySharedSecret:
|
||||||
description: Metadata Secret
|
description: Shared secret to prevent spoofing
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
ContrailVrouterPhysicalInterface:
|
ContrailVrouterPhysicalInterface:
|
||||||
|
@ -32,8 +32,7 @@ parameters:
|
|||||||
type: json
|
type: json
|
||||||
NeutronEnableL2Pop:
|
NeutronEnableL2Pop:
|
||||||
type: string
|
type: string
|
||||||
description: >
|
description: Enable/disable the L2 population feature in the Neutron agents.
|
||||||
Enable/disable the L2 population feature in the Neutron agents.
|
|
||||||
default: "False"
|
default: "False"
|
||||||
NeutronBridgeMappings:
|
NeutronBridgeMappings:
|
||||||
description: >
|
description: >
|
||||||
@ -47,8 +46,7 @@ parameters:
|
|||||||
default: "datacentre:br-ex"
|
default: "datacentre:br-ex"
|
||||||
NeutronTunnelTypes:
|
NeutronTunnelTypes:
|
||||||
default: 'vxlan'
|
default: 'vxlan'
|
||||||
description: |
|
description: The tunnel types for the Neutron tenant network.
|
||||||
The tunnel types for the Neutron tenant network.
|
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
NeutronAgentExtensions:
|
NeutronAgentExtensions:
|
||||||
default: "qos"
|
default: "qos"
|
||||||
|
@ -45,7 +45,7 @@ parameters:
|
|||||||
bridge on hosts - to a physical name 'datacentre' which can be used
|
bridge on hosts - to a physical name 'datacentre' which can be used
|
||||||
to create provider networks (and we use this for the default floating
|
to create provider networks (and we use this for the default floating
|
||||||
network) - if changing this either use different post-install network
|
network) - if changing this either use different post-install network
|
||||||
scripts or be sure to keep 'datacentre' as a mapping network name
|
scripts or be sure to keep 'datacentre' as a mapping network name.
|
||||||
type: comma_delimited_list
|
type: comma_delimited_list
|
||||||
default: "datacentre:br-ex"
|
default: "datacentre:br-ex"
|
||||||
|
|
||||||
|
@ -50,81 +50,57 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
|
|||||||
'ExternalAllocationPools': ['default'],
|
'ExternalAllocationPools': ['default'],
|
||||||
'StorageNetCidr': ['default'],
|
'StorageNetCidr': ['default'],
|
||||||
'StorageAllocationPools': ['default'],
|
'StorageAllocationPools': ['default'],
|
||||||
'StorageMgmtNetCidr': ['default',
|
'StorageMgmtNetCidr': ['default'],
|
||||||
# FIXME
|
|
||||||
'description'],
|
|
||||||
'StorageMgmtAllocationPools': ['default'],
|
'StorageMgmtAllocationPools': ['default'],
|
||||||
'TenantNetCidr': ['default'],
|
'TenantNetCidr': ['default'],
|
||||||
'TenantAllocationPools': ['default'],
|
'TenantAllocationPools': ['default'],
|
||||||
'InternalApiNetCidr': ['default'],
|
'InternalApiNetCidr': ['default'],
|
||||||
|
'InternalApiAllocationPools': ['default'],
|
||||||
'UpdateIdentifier': ['description'],
|
'UpdateIdentifier': ['description'],
|
||||||
'key_name': ['default'],
|
'key_name': ['default'],
|
||||||
|
# There's one template that defines this
|
||||||
|
# differently, and I'm not sure if we can
|
||||||
|
# safely change it.
|
||||||
|
'EC2MetadataIp': ['default'],
|
||||||
|
# Same as EC2MetadataIp
|
||||||
|
'ControlPlaneDefaultRoute': ['default'],
|
||||||
# TODO(bnemec): Address these existing
|
# TODO(bnemec): Address these existing
|
||||||
# inconsistencies.
|
# inconsistencies.
|
||||||
'NeutronMetadataProxySharedSecret': [
|
|
||||||
'description', 'hidden'],
|
|
||||||
'ServiceNetMap': ['description', 'default'],
|
'ServiceNetMap': ['description', 'default'],
|
||||||
'EC2MetadataIp': ['default'],
|
|
||||||
'network': ['default'],
|
'network': ['default'],
|
||||||
'ControlPlaneIP': ['default',
|
'ControlPlaneIP': ['default',
|
||||||
'description'],
|
'description'],
|
||||||
'ControlPlaneIp': ['default',
|
'ControlPlaneIp': ['default',
|
||||||
'description'],
|
'description'],
|
||||||
'NeutronBigswitchLLDPEnabled': ['default'],
|
'NeutronBigswitchLLDPEnabled': ['default'],
|
||||||
'NeutronEnableL2Pop': ['description'],
|
|
||||||
'NeutronWorkers': ['description'],
|
'NeutronWorkers': ['description'],
|
||||||
'TenantIpSubnet': ['description'],
|
|
||||||
'ExternalNetName': ['description'],
|
|
||||||
'ControlPlaneDefaultRoute': ['default'],
|
|
||||||
'StorageMgmtNetName': ['description'],
|
|
||||||
'ServerMetadata': ['description'],
|
'ServerMetadata': ['description'],
|
||||||
'InternalApiIpUri': ['description'],
|
|
||||||
'UpgradeLevelNovaCompute': ['default'],
|
'UpgradeLevelNovaCompute': ['default'],
|
||||||
'StorageMgmtIpUri': ['description'],
|
|
||||||
'server': ['description'],
|
'server': ['description'],
|
||||||
'servers': ['description'],
|
'servers': ['description'],
|
||||||
'FixedIPs': ['description'],
|
|
||||||
'ExternalIpSubnet': ['description'],
|
|
||||||
'NeutronBridgeMappings': ['description'],
|
|
||||||
'ExtraConfig': ['description'],
|
'ExtraConfig': ['description'],
|
||||||
'InternalApiIpSubnet': ['description'],
|
|
||||||
'DefaultPasswords': ['description',
|
'DefaultPasswords': ['description',
|
||||||
'default'],
|
'default'],
|
||||||
'BondInterfaceOvsOptions': ['description',
|
'BondInterfaceOvsOptions': ['description',
|
||||||
'default',
|
'default',
|
||||||
'constraints'],
|
'constraints'],
|
||||||
'KeyName': ['constraints'],
|
'KeyName': ['constraints'],
|
||||||
'TenantNetName': ['description'],
|
|
||||||
'StorageIpSubnet': ['description'],
|
|
||||||
'OVNSouthboundServerPort': ['description'],
|
'OVNSouthboundServerPort': ['description'],
|
||||||
'ExternalInterfaceDefaultRoute':
|
'ExternalInterfaceDefaultRoute':
|
||||||
['description', 'default'],
|
['description', 'default'],
|
||||||
'ExternalIpUri': ['description'],
|
|
||||||
'IPPool': ['description'],
|
'IPPool': ['description'],
|
||||||
'ControlPlaneNetwork': ['description'],
|
|
||||||
'SSLCertificate': ['description',
|
'SSLCertificate': ['description',
|
||||||
'default',
|
'default',
|
||||||
'hidden'],
|
'hidden'],
|
||||||
'HostCpusList': ['default', 'constraints'],
|
'HostCpusList': ['default', 'constraints'],
|
||||||
'InternalApiAllocationPools': ['default'],
|
|
||||||
'NodeIndex': ['description'],
|
'NodeIndex': ['description'],
|
||||||
'name': ['description', 'default'],
|
'name': ['description', 'default'],
|
||||||
'StorageNetName': ['description'],
|
|
||||||
'ManagementNetName': ['description'],
|
|
||||||
'NeutronPublicInterface': ['description'],
|
|
||||||
'ManagementInterfaceDefaultRoute':
|
|
||||||
['default'],
|
|
||||||
'image': ['description', 'default'],
|
'image': ['description', 'default'],
|
||||||
'NeutronBigswitchAgentEnabled': ['default'],
|
'NeutronBigswitchAgentEnabled': ['default'],
|
||||||
'EndpointMap': ['description', 'default'],
|
'EndpointMap': ['description', 'default'],
|
||||||
'DockerManilaConfigImage': ['description',
|
'DockerManilaConfigImage': ['description',
|
||||||
'default'],
|
'default'],
|
||||||
'NetworkName': ['default', 'description'],
|
|
||||||
'StorageIpUri': ['description'],
|
|
||||||
'InternalApiNetName': ['description'],
|
|
||||||
'NeutronTunnelTypes': ['description'],
|
|
||||||
'replacement_policy': ['default'],
|
'replacement_policy': ['default'],
|
||||||
'StorageMgmtIpSubnet': ['description'],
|
|
||||||
'CloudDomain': ['description', 'default'],
|
'CloudDomain': ['description', 'default'],
|
||||||
'EnableLoadBalancer': ['description'],
|
'EnableLoadBalancer': ['description'],
|
||||||
'ControllerExtraConfig': ['description'],
|
'ControllerExtraConfig': ['description'],
|
||||||
|
Loading…
Reference in New Issue
Block a user