Browse Source

Merge "Create split out neutron networks via Heat."

changes/44/177844/8
Jenkins 7 years ago committed by Gerrit Code Review
parent
commit
2c6ea075cf
  1. 58
      network/external.yaml
  2. 57
      network/internal_api.yaml
  3. 20
      network/networks.yaml
  4. 3
      network/noop.yaml
  5. 57
      network/storage.yaml
  6. 57
      network/storage_mgmt.yaml
  7. 57
      network/tenant.yaml

58
network/external.yaml

@ -0,0 +1,58 @@
heat_template_version: 2014-10-16
description: >
External network. Public traffic, Neutron l3router for floating IPs/SNAT, etc.
parameters:
# the defaults here work for static IP assignment (IPAM) only
ExternalNetCidr:
default: '10.0.0.0/24'
description: Cidr for the external network.
type: string
ExternalNetValueSpecs:
default: {'provider:physical_network': 'external', 'provider:network_type': 'flat'}
description: Value specs for the external network.
type: string
ExternalNetAdminStateUp:
default: false
description: This admin state of of the network.
type: boolean
ExternalNetEnableDHCP:
default: false
description: Whether to enable DHCP on the associated subnet.
type: boolean
ExternalNetShared:
default: false
description: Whether this network is shared across all tenants.
type: boolean
ExternalNetName:
default: external
description: The name of the external network.
type: string
ExternalSubnetName:
default: external_subnet
description: The name of the external subnet in Neutron.
type: string
resources:
ExternalNetwork:
type: OS::Neutron::Net
properties:
admin_state_up: {get_param: ExternalNetAdminStateUp}
name: {get_param: ExternalNetName}
shared: {get_param: ExternalNetShared}
value_specs: {get_param: ExternalNetValueSpecs}
ExternalSubnet:
type: OS::Neutron::Subnet
properties:
cidr: {get_param: ExternalNetCidr}
enable_dhcp: {get_param: ExternalNetEnableDHCP}
name: {get_param: ExternalSubnetName}
network: {get_resource: ExternalNetwork}
outputs:
OS::stack_id:
description: Neutron external network
value: {get_resource: ExternalNetwork}

57
network/internal_api.yaml

@ -0,0 +1,57 @@
heat_template_version: 2014-10-16
description: >
Internal API network. Used for most APIs, Database, RPC.
parameters:
# the defaults here work for static IP assignment (IPAM) only
InternalApiNetCidr:
default: '172.16.2.0/24'
description: Cidr for the internal API network.
type: string
InternalApiNetValueSpecs:
default: {'provider:physical_network': 'internal_api', 'provider:network_type': 'flat'}
description: Value specs for the internal API network.
type: string
InternalApiNetAdminStateUp:
default: false
description: This admin state of of the network.
type: boolean
InternalApiNetEnableDHCP:
default: false
description: Whether to enable DHCP on the associated subnet.
type: boolean
InternalApiNetShared:
default: false
description: Whether this network is shared across all tenants.
type: boolean
InternalApiNetName:
default: internal_api
description: The name of the internal API network.
type: string
InternalApiSubnetName:
default: internal_api_subnet
description: The name of the internal API subnet in Neutron.
type: string
resources:
InternalApiNetwork:
type: OS::Neutron::Net
properties:
admin_state_up: {get_param: InternalApiNetAdminStateUp}
name: {get_param: InternalApiNetName}
shared: {get_param: InternalApiNetShared}
value_specs: {get_param: InternalApiNetValueSpecs}
InternalApiSubnet:
type: OS::Neutron::Subnet
properties:
cidr: {get_param: InternalApiNetCidr}
enable_dhcp: {get_param: InternalApiNetEnableDHCP}
name: {get_param: InternalApiSubnetName}
network: {get_resource: InternalApiNetwork}
outputs:
OS::stack_id:
description: Neutron internal network
value: {get_resource: InternalApiNetwork}

20
network/networks.yaml

@ -0,0 +1,20 @@
heat_template_version: 2014-10-16
description: Create networks to split out Overcloud traffic
resources:
ExternalNetwork:
type: OS::TripleO::Network::External
InternalNetwork:
type: OS::TripleO::Network::InternalApi
StorageMgmtNetwork:
type: OS::TripleO::Network::StorageMgmt
StorageNetwork:
type: OS::TripleO::Network::Storage
TenantNetwork:
type: OS::TripleO::Network::Tenant

3
network/noop.yaml

@ -0,0 +1,3 @@
heat_template_version: 2014-10-16
description: A stack which creates no network(s).

57
network/storage.yaml

@ -0,0 +1,57 @@
heat_template_version: 2014-10-16
description: >
Storage network.
parameters:
# the defaults here work for static IP assignment (IPAM) only
StorageNetCidr:
default: '172.16.1.0/24'
description: Cidr for the storage network.
type: string
StorageNetValueSpecs:
default: {'provider:physical_network': 'storage', 'provider:network_type': 'flat'}
description: Value specs for the storage network.
type: string
StorageNetAdminStateUp:
default: false
description: This admin state of of the network.
type: boolean
StorageNetEnableDHCP:
default: false
description: Whether to enable DHCP on the associated subnet.
type: boolean
StorageNetShared:
default: false
description: Whether this network is shared across all tenants.
type: boolean
StorageNetName:
default: storage
description: The name of the storage network.
type: string
StorageSubnetName:
default: storage_subnet
description: The name of the storage subnet in Neutron.
type: string
resources:
StorageNetwork:
type: OS::Neutron::Net
properties:
admin_state_up: {get_param: StorageNetAdminStateUp}
name: {get_param: StorageNetName}
shared: {get_param: StorageNetShared}
value_specs: {get_param: StorageNetValueSpecs}
StorageSubnet:
type: OS::Neutron::Subnet
properties:
cidr: {get_param: StorageNetCidr}
enable_dhcp: {get_param: StorageNetEnableDHCP}
name: {get_param: StorageSubnetName}
network: {get_resource: StorageNetwork}
outputs:
OS::stack_id:
description: Neutron storage network
value: {get_resource: StorageNetwork}

57
network/storage_mgmt.yaml

@ -0,0 +1,57 @@
heat_template_version: 2014-10-16
description: >
Storage management network. Storage replication, etc.
parameters:
# the defaults here work for static IP assignment (IPAM) only
StorageMgmtNetCidr:
default: '172.16.3.0/24'
description: Cidr for the storage management network.
type: string
StorageMgmtNetValueSpecs:
default: {'provider:physical_network': 'storage_mgmt', 'provider:network_type': 'flat'}
description: Value specs for the storage_mgmt network.
type: string
StorageMgmtNetAdminStateUp:
default: false
description: This admin state of of the network.
type: boolean
StorageMgmtNetEnableDHCP:
default: false
description: Whether to enable DHCP on the associated subnet.
type: boolean
StorageMgmtNetShared:
default: false
description: Whether this network is shared across all tenants.
type: boolean
StorageMgmtNetName:
default: storage_mgmt
description: The name of the Storage management network.
type: string
StorageMgmtSubnetName:
default: storage_mgmt_subnet
description: The name of the Storage management subnet in Neutron.
type: string
resources:
StorageMgmtNetwork:
type: OS::Neutron::Net
properties:
admin_state_up: {get_param: StorageMgmtNetAdminStateUp}
name: {get_param: StorageMgmtNetName}
shared: {get_param: StorageMgmtNetShared}
value_specs: {get_param: StorageMgmtNetValueSpecs}
StorageMgmtSubnet:
type: OS::Neutron::Subnet
properties:
cidr: {get_param: StorageMgmtNetCidr}
enable_dhcp: {get_param: StorageMgmtNetEnableDHCP}
name: {get_param: StorageMgmtSubnetName}
network: {get_resource: StorageMgmtNetwork}
outputs:
OS::stack_id:
description: Neutron storage management network
value: {get_resource: StorageMgmtNetwork}

57
network/tenant.yaml

@ -0,0 +1,57 @@
heat_template_version: 2014-10-16
description: >
Tenant network.
parameters:
# the defaults here work for static IP assignment (IPAM) only
TenantNetCidr:
default: '172.16.0.0/24'
description: Cidr for the tenant network.
type: string
TenantNetValueSpecs:
default: {'provider:physical_network': 'tenant', 'provider:network_type': 'flat'}
description: Value specs for the tenant network.
type: string
TenantNetAdminStateUp:
default: false
description: This admin state of of the network.
type: boolean
TenantNetEnableDHCP:
default: false
description: Whether to enable DHCP on the associated subnet.
type: boolean
TenantNetShared:
default: false
description: Whether this network is shared across all tenants.
type: boolean
TenantNetName:
default: tenant
description: The name of the tenant network.
type: string
TenantSubnetName:
default: tenant_subnet
description: The name of the tenant subnet in Neutron.
type: string
resources:
TenantNetwork:
type: OS::Neutron::Net
properties:
admin_state_up: {get_param: TenantNetAdminStateUp}
name: {get_param: TenantNetName}
shared: {get_param: TenantNetShared}
value_specs: {get_param: TenantNetValueSpecs}
TenantSubnet:
type: OS::Neutron::Subnet
properties:
cidr: {get_param: TenantNetCidr}
enable_dhcp: {get_param: TenantNetEnableDHCP}
name: {get_param: TenantSubnetName}
network: {get_resource: TenantNetwork}
outputs:
OS::stack_id:
description: Neutron tenant network
value: {get_resource: TenantNetwork}
Loading…
Cancel
Save