diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-03-07 14:52:56 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-03-07 14:52:56 +0000 |
commit | f352773cf37027724ea0252bd18a8ab3fe7b99e9 (patch) | |
tree | a5b0716cda84f83b245fdd6cdfbfd9d970954f17 /network | |
parent | 582a3115f744af151f4cd36a5ad0ac3e8ef09a7f (diff) | |
parent | 7981f69c034c5d08abade7f62161aeec65045814 (diff) |
Merge "Make the Neutron subnet ipv6_{ra,address}_mode configurable"
Diffstat (limited to 'network')
-rw-r--r-- | network/external_v6.yaml | 12 | ||||
-rw-r--r-- | network/internal_api_v6.yaml | 12 | ||||
-rw-r--r-- | network/storage_mgmt_v6.yaml | 12 | ||||
-rw-r--r-- | network/storage_v6.yaml | 12 | ||||
-rw-r--r-- | network/tenant_v6.yaml | 12 |
5 files changed, 50 insertions, 10 deletions
diff --git a/network/external_v6.yaml b/network/external_v6.yaml index cfbe94c3..3e120f24 100644 --- a/network/external_v6.yaml +++ b/network/external_v6.yaml @@ -34,6 +34,14 @@ parameters: default: [{'start': '2001:db8:fd00:1000::10', 'end': '2001:db8:fd00:1000:ffff:ffff:ffff:fffe'}] description: Ip allocation pool range for the external network. type: json + IPv6AddressMode: + default: dhcpv6-stateful + description: Neutron subnet IPv6 address mode + type: string + IPv6RAMode: + default: dhcpv6-stateful + description: Neutron subnet IPv6 router advertisement mode + type: string resources: ExternalNetwork: @@ -48,8 +56,8 @@ resources: type: OS::Neutron::Subnet properties: ip_version: 6 - ipv6_address_mode: slaac - ipv6_ra_mode: slaac + ipv6_address_mode: {get_param: IPv6AddressMode} + ipv6_ra_mode: {get_param: IPv6RAMode} cidr: {get_param: ExternalNetCidr} name: {get_param: ExternalSubnetName} network: {get_resource: ExternalNetwork} diff --git a/network/internal_api_v6.yaml b/network/internal_api_v6.yaml index 9f5c68b2..68c14fbe 100644 --- a/network/internal_api_v6.yaml +++ b/network/internal_api_v6.yaml @@ -34,6 +34,14 @@ parameters: default: [{'start': 'fd00:fd00:fd00:2000::10', 'end': 'fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe'}] description: Ip allocation pool range for the internal API network. type: json + IPv6AddressMode: + default: dhcpv6-stateful + description: Neutron subnet IPv6 address mode + type: string + IPv6RAMode: + default: dhcpv6-stateful + description: Neutron subnet IPv6 router advertisement mode + type: string resources: InternalApiNetwork: @@ -48,8 +56,8 @@ resources: type: OS::Neutron::Subnet properties: ip_version: 6 - ipv6_address_mode: slaac - ipv6_ra_mode: slaac + ipv6_address_mode: {get_param: IPv6AddressMode} + ipv6_ra_mode: {get_param: IPv6RAMode} cidr: {get_param: InternalApiNetCidr} name: {get_param: InternalApiSubnetName} network: {get_resource: InternalApiNetwork} diff --git a/network/storage_mgmt_v6.yaml b/network/storage_mgmt_v6.yaml index cde78652..f05644ef 100644 --- a/network/storage_mgmt_v6.yaml +++ b/network/storage_mgmt_v6.yaml @@ -34,6 +34,14 @@ parameters: default: [{'start': 'fd00:fd00:fd00:4000::10', 'end': 'fd00:fd00:fd00:4000:ffff:ffff:ffff:fffe'}] description: Ip allocation pool range for the storage mgmt network. type: json + IPv6AddressMode: + default: dhcpv6-stateful + description: Neutron subnet IPv6 address mode + type: string + IPv6RAMode: + default: dhcpv6-stateful + description: Neutron subnet IPv6 router advertisement mode + type: string resources: StorageMgmtNetwork: @@ -48,8 +56,8 @@ resources: type: OS::Neutron::Subnet properties: ip_version: 6 - ipv6_address_mode: slaac - ipv6_ra_mode: slaac + ipv6_address_mode: {get_param: IPv6AddressMode} + ipv6_ra_mode: {get_param: IPv6RAMode} cidr: {get_param: StorageMgmtNetCidr} name: {get_param: StorageMgmtSubnetName} network: {get_resource: StorageMgmtNetwork} diff --git a/network/storage_v6.yaml b/network/storage_v6.yaml index 4ea73414..36a6fae8 100644 --- a/network/storage_v6.yaml +++ b/network/storage_v6.yaml @@ -34,6 +34,14 @@ parameters: default: [{'start': 'fd00:fd00:fd00:3000::10', 'end': 'fd00:fd00:fd00:3000:ffff:ffff:ffff:fffe'}] description: Ip allocation pool range for the storage network. type: json + IPv6AddressMode: + default: dhcpv6-stateful + description: Neutron subnet IPv6 address mode + type: string + IPv6RAMode: + default: dhcpv6-stateful + description: Neutron subnet IPv6 router advertisement mode + type: string resources: StorageNetwork: @@ -48,8 +56,8 @@ resources: type: OS::Neutron::Subnet properties: ip_version: 6 - ipv6_address_mode: slaac - ipv6_ra_mode: slaac + ipv6_address_mode: {get_param: IPv6AddressMode} + ipv6_ra_mode: {get_param: IPv6RAMode} cidr: {get_param: StorageNetCidr} name: {get_param: StorageSubnetName} network: {get_resource: StorageNetwork} diff --git a/network/tenant_v6.yaml b/network/tenant_v6.yaml index b20c9528..b653eaf7 100644 --- a/network/tenant_v6.yaml +++ b/network/tenant_v6.yaml @@ -34,6 +34,14 @@ parameters: default: [{'start': 'fd00:fd00:fd00:5000::10', 'end': 'fd00:fd00:fd00:5000:ffff:ffff:ffff:fffe'}] description: Ip allocation pool range for the tenant network. type: json + IPv6AddressMode: + default: dhcpv6-stateful + description: Neutron subnet IPv6 address mode + type: string + IPv6RAMode: + default: dhcpv6-stateful + description: Neutron subnet IPv6 router advertisement mode + type: string resources: TenantNetwork: @@ -48,8 +56,8 @@ resources: type: OS::Neutron::Subnet properties: ip_version: 6 - ipv6_address_mode: slaac - ipv6_ra_mode: slaac + ipv6_address_mode: {get_param: IPv6AddressMode} + ipv6_ra_mode: {get_param: IPv6RAMode} cidr: {get_param: TenantNetCidr} name: {get_param: TenantSubnetName} network: {get_resource: TenantNetwork} |