Support ipv6 for provisioning and overcloud subnets

Add parameters to set the ip_version for the subnets.
By default ip_version for all networks are 4.

Change-Id: I1c5a001fe2ec5c4194030fdf373c0a4318cba10c
This commit is contained in:
Harald Jensås 2019-07-03 15:10:27 +02:00
parent c6b434df05
commit 6f24206102
8 changed files with 161 additions and 0 deletions

View File

@ -20,6 +20,10 @@ parameter_defaults:
# Type: string
overcloud_internal_net_cidr: 172.17.0.0/24
# IP version for the overcloud_internal_net subnet
# Type: number
overcloud_internal_net_ip_version: 4
# Name of storage management network
# Type: string
overcloud_storage_mgmt_net: overcloud_storage_mgmt
@ -29,6 +33,10 @@ parameter_defaults:
# Type: string
overcloud_storage_mgmt_net_cidr: 172.19.0.0/24
# IP version for the overcloud_storage_mgmt_net subnet
# Type: number
overcloud_storage_mgmt_net_ip_version: 4
# Name of storage network
# Type: string
overcloud_storage_net: overcloud_storage
@ -38,6 +46,10 @@ parameter_defaults:
# Type: string
overcloud_storage_net_cidr: 172.18.0.0/24
# IP version for the overcloud_storage_net subnet
# Type: number
overcloud_storage_net_ip_version: 4
# Name of tenant network
# Type: string
overcloud_tenant_net: overcloud_tenant
@ -47,6 +59,10 @@ parameter_defaults:
# Type: string
overcloud_tenant_net_cidr: 172.16.0.0/24
# IP version for the overcloud_tenant_net subnet
# Type: number
overcloud_tenant_net_ip_version: 4
resource_registry:
OS::OVB::BaremetalNetworks: ../templates/baremetal-networks-all.yaml
OS::OVB::BaremetalPorts: ../templates/baremetal-ports-public-bond.yaml

View File

@ -18,6 +18,10 @@ parameter_defaults:
# Type: string
overcloud_internal_net_cidr: 172.17.0.0/24
# IP version for the overcloud_internal_net subnet
# Type: number
overcloud_internal_net_ip_version: 4
# Name of storage management network
# Type: string
overcloud_storage_mgmt_net: overcloud_storage_mgmt
@ -27,6 +31,10 @@ parameter_defaults:
# Type: string
overcloud_storage_mgmt_net_cidr: 172.19.0.0/24
# IP version for the overcloud_storage_mgmt_net subnet
# Type: number
overcloud_storage_mgmt_net_ip_version: 4
# Name of storage network
# Type: string
overcloud_storage_net: overcloud_storage
@ -36,6 +44,10 @@ parameter_defaults:
# Type: string
overcloud_storage_net_cidr: 172.18.0.0/24
# IP version for the overcloud_storage_net subnet
# Type: number
overcloud_storage_net_ip_version: 4
# Name of tenant network
# Type: string
overcloud_tenant_net: overcloud_tenant
@ -45,6 +57,10 @@ parameter_defaults:
# Type: string
overcloud_tenant_net_cidr: 172.16.0.0/24
# IP version for the overcloud_tenant_net subnet
# Type: number
overcloud_tenant_net_ip_version: 4
resource_registry:
OS::OVB::BaremetalNetworks: ../templates/baremetal-networks-all.yaml
OS::OVB::BaremetalPorts: ../templates/baremetal-ports-all.yaml

View File

@ -16,6 +16,11 @@ parameters:
does not need to be changed.
default: 172.17.0.0/24
overcloud_internal_net_ip_version:
type: number
description: IP version for the overcloud_internal_net subnet
default: 4
overcloud_storage_net:
type: string
description: Name of storage network
@ -28,6 +33,11 @@ parameters:
does not need to be changed.
default: 172.18.0.0/24
overcloud_storage_net_ip_version:
type: number
description: IP version for the overcloud_storage_net subnet
default: 4
overcloud_storage_mgmt_net:
type: string
description: Name of storage management network
@ -40,6 +50,11 @@ parameters:
and does not need to be changed.
default: 172.19.0.0/24
overcloud_storage_mgmt_net_ip_version:
type: number
description: IP version for the overcloud_storage_mgmt_net subnet
default: 4
overcloud_tenant_net:
type: string
description: Name of tenant network
@ -52,6 +67,11 @@ parameters:
does not need to be changed.
default: 172.16.0.0/24
overcloud_tenant_net_ip_version:
type: number
description: IP version for the overcloud_tenant_net subnet
default: 4
resources:
internal_network:
@ -67,6 +87,7 @@ resources:
cidr: {get_param: overcloud_internal_net_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: overcloud_internal_net_ip_version}
storage_network:
type: OS::Neutron::Net
@ -81,6 +102,7 @@ resources:
cidr: {get_param: overcloud_storage_net_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: overcloud_storage_net_ip_version}
storage_mgmt_network:
type: OS::Neutron::Net
@ -95,6 +117,7 @@ resources:
cidr: {get_param: overcloud_storage_mgmt_net_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: overcloud_storage_mgmt_net_ip_version}
tenant_network:
type: OS::Neutron::Net
@ -109,6 +132,7 @@ resources:
cidr: {get_param: overcloud_tenant_net_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: overcloud_tenant_net_ip_version}
outputs:
networks:

View File

@ -21,6 +21,11 @@ parameters:
description: Router address for the overcloud_internal_net
default: 172.17.0.254
overcloud_internal_net_ip_version:
type: number
description: IP version for the overcloud_internal_net subnet
default: 4
overcloud_internal_net2:
type: string
description: Name of internal API network
@ -38,6 +43,11 @@ parameters:
description: Router address for the overcloud_internal_net2 subnet
default: 172.17.1.254
overcloud_internal_net2_ip_version:
type: number
description: IP version for the overcloud_internal_net2 subnet
default: 4
overcloud_storage_net:
type: string
description: Name of storage network
@ -55,6 +65,11 @@ parameters:
description: Router address for the overcloud_storage_net subnet
default: 172.18.0.254
overcloud_storage_net_ip_version:
type: number
description: IP version for the overcloud_storage_net subnet
default: 4
overcloud_storage_net2:
type: string
description: Name of storage network
@ -72,6 +87,11 @@ parameters:
description: Router address for the overcloud_storage_net2 subnet
default: 172.18.1.254
overcloud_storage_net2_ip_version:
type: number
description: IP version for the overcloud_storage_net2 subnet
default: 4
overcloud_storage_mgmt_net:
type: string
description: Name of storage management network
@ -89,6 +109,11 @@ parameters:
description: Router address for the overcloud_storage_mgmt_net subnet
default: 172.19.0.254
overcloud_storage_mgmt_net_ip_version:
type: number
description: IP version for the overcloud_storage_mgmt_net subnet
default: 4
overcloud_storage_mgmt_net2:
type: string
description: Name of storage management network
@ -106,6 +131,11 @@ parameters:
description: Router address for the overcloud_storage_mgmt_net2 subnet
default: 172.19.1.254
overcloud_storage_mgmt_net2_ip_version:
type: number
description: IP version for the overcloud_storage_mgmt_net2 subnet
default: 4
overcloud_tenant_net:
type: string
description: Name of tenant network
@ -123,6 +153,11 @@ parameters:
description: Router address for the overcloud_tenant_net subnet
default: 172.16.0.254
overcloud_tenant_net_ip_version:
type: number
description: IP version for the overcloud_tenant_net subnet
default: 4
overcloud_tenant_net2:
type: string
description: Name of tenant network
@ -140,6 +175,11 @@ parameters:
description: Router address for the overcloud_tenant_net2 subnet
default: 172.16.1.254
overcloud_tenant_net2_ip_version:
type: number
description: IP version for the overcloud_tenant_net2 subnet
default: 4
resources:
internal_router:
type: OS::Neutron::Router
@ -159,6 +199,7 @@ resources:
cidr: {get_param: overcloud_internal_net_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: overcloud_internal_net_ip_version}
internal_subnet_port:
type: OS::Neutron::Port
@ -187,6 +228,7 @@ resources:
cidr: {get_param: overcloud_internal_net2_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: overcloud_internal_net2_ip_version}
internal_subnet2_port:
type: OS::Neutron::Port
@ -220,6 +262,7 @@ resources:
cidr: {get_param: overcloud_storage_net_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: overcloud_storage_net_ip_version}
storage_subnet_port:
type: OS::Neutron::Port
@ -248,6 +291,7 @@ resources:
cidr: {get_param: overcloud_storage_net2_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: overcloud_storage_net2_ip_version}
storage_subnet2_port:
type: OS::Neutron::Port
@ -281,6 +325,7 @@ resources:
cidr: {get_param: overcloud_storage_mgmt_net_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: overcloud_storage_mgmt_net_ip_version}
storage_mgmt_subnet_port:
type: OS::Neutron::Port
@ -309,6 +354,7 @@ resources:
cidr: {get_param: overcloud_storage_mgmt_net2_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: overcloud_storage_mgmt_net2_ip_version}
storage_mgmt_subnet2_port:
type: OS::Neutron::Port
@ -342,6 +388,7 @@ resources:
cidr: {get_param: overcloud_tenant_net_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: overcloud_tenant_net_ip_version}
tenant_subnet_port:
type: OS::Neutron::Port
@ -370,6 +417,7 @@ resources:
cidr: {get_param: overcloud_tenant_net2_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: overcloud_tenant_net2_ip_version}
tenant_subnet2_port:
type: OS::Neutron::Port

View File

@ -11,6 +11,11 @@ parameters:
description: CIDR for provision network subnet
default: 192.0.2.0/24
provision_net_ip_version:
type: number
description: IP version for the provision_net subnet
default: 4
provision_net_shared:
type: boolean
description: Whether this network should be shared across all tenants
@ -26,6 +31,11 @@ parameters:
description: CIDR for external network subnet
default: 10.0.0.0/24
public_subnet_ip_version:
type: number
description: IP version for the public subnet
default: 4
public_net_shared:
type: boolean
description: Whether this network should be shared across all tenants

View File

@ -11,6 +11,11 @@ parameters:
description: CIDR for provision network subnet
default: 192.168.24.0/24
provision_net_ip_version:
type: number
description: IP version for the provision_net subnet
default: 4
provision_net_shared:
type: boolean
description: Whether this network should be shared across all tenants
@ -31,6 +36,11 @@ parameters:
description: Router address for the public network subnet
default: 10.0.0.254
public_net_ip_version:
type: number
description: IP version for the public subnet
default: 4
public_net_shared:
type: boolean
description: Whether this network should be shared across all tenants
@ -70,6 +80,7 @@ resources:
cidr: {get_param: public_net_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: public_net_ip_version}
public_router:
type: OS::Neutron::Router

View File

@ -16,6 +16,11 @@ parameters:
description: Router address for the provision network subnet
default: 192.168.24.254
provision_net_ip_version:
type: number
description: IP version for the provision_net subnet
default: 4
provision_net_shared:
type: boolean
description: Whether this network should be shared across all tenants
@ -36,6 +41,11 @@ parameters:
description: Router address for the provision network subnet
default: 192.168.25.254
provision_net2_ip_version:
type: number
description: IP version for the provision_net2 subnet
default: 4
provision_net2_shared:
type: boolean
description: Whether this network should be shared across all tenants
@ -56,6 +66,11 @@ parameters:
description: Router address for the provision network subnet
default: 192.168.26.254
provision_net3_ip_version:
type: number
description: IP version for the provision_net3 subnet
default: 4
provision_net3_shared:
type: boolean
description: Whether this network should be shared across all tenants
@ -76,6 +91,11 @@ parameters:
description: Router address for the public network subnet
default: 10.0.0.254
public_net_ip_version:
type: number
description: IP version for the public subnet
default: 4
public_net_shared:
type: boolean
description: Whether this network should be shared across all tenants
@ -107,6 +127,7 @@ resources:
cidr: {get_param: provision_net_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: provision_net_ip_version}
provision_router_port:
type: OS::Neutron::Port
@ -136,6 +157,7 @@ resources:
cidr: {get_param: provision_net2_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: provision_net2_ip_version}
provision_router_port2:
type: OS::Neutron::Port
@ -165,6 +187,7 @@ resources:
cidr: {get_param: provision_net3_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: provision_net3_ip_version}
provision_router_port3:
type: OS::Neutron::Port
@ -194,6 +217,7 @@ resources:
cidr: {get_param: public_net_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: public_net_ip_version}
public_router:
type: OS::Neutron::Router

View File

@ -11,6 +11,11 @@ parameters:
description: CIDR for provision network subnet
default: 192.168.24.0/24
provision_net_ip_version:
type: number
description: IP version for the provision_net subnet
default: 4
provision_net_shared:
type: boolean
description: Whether this network should be shared across all tenants
@ -26,6 +31,11 @@ parameters:
description: CIDR for external network subnet
default: 10.0.0.0/24
public_net_ip_version:
type: number
description: IP version for the public subnet
default: 4
public_net_shared:
type: boolean
description: Whether this network should be shared across all tenants
@ -46,6 +56,7 @@ resources:
cidr: {get_param: provision_net_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: provision_net_ip_version}
public_network:
type: OS::Neutron::Net
@ -61,6 +72,7 @@ resources:
cidr: {get_param: public_net_cidr}
gateway_ip: null
enable_dhcp: false
ip_version: {get_param: public_net_ip_version}
outputs:
networks: