diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-12-23 17:27:25 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-12-23 17:27:25 +0000 |
commit | 2a05569f0261509fcb3f411917c8863f53ca78d7 (patch) | |
tree | 46ad07e61c44a5d17797f674c9b0866bca20818c /network/config/multiple-nics/compute.yaml | |
parent | c40f2a3b67274e9c7133ce9fd44d8635a8aa4674 (diff) | |
parent | 15bb67261a333f140f21208e20a112b99eeb609c (diff) |
Merge "Add Management Network For System Administration."
Diffstat (limited to 'network/config/multiple-nics/compute.yaml')
-rw-r--r-- | network/config/multiple-nics/compute.yaml | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/network/config/multiple-nics/compute.yaml b/network/config/multiple-nics/compute.yaml index 6afff901..97eef52b 100644 --- a/network/config/multiple-nics/compute.yaml +++ b/network/config/multiple-nics/compute.yaml @@ -29,6 +29,14 @@ parameters: default: '' description: IP address/subnet on the tenant network type: string + ManagementIpSubnet: # Only populated when including environments/network-management.yaml + default: '' + description: IP address/subnet on the management network + type: string + ExternalNetworkVlanID: + default: 10 + description: Vlan ID for the external network traffic. + type: number InternalApiNetworkVlanID: default: 20 description: Vlan ID for the internal_api network traffic. @@ -37,10 +45,22 @@ parameters: default: 30 description: Vlan ID for the storage network traffic. type: number + StorageMgmtNetworkVlanID: + default: 40 + description: Vlan ID for the storage mgmt network traffic. + type: number TenantNetworkVlanID: default: 50 description: Vlan ID for the tenant network traffic. type: number + ManagementNetworkVlanID: + default: 60 + description: Vlan ID for the management network traffic. + type: number + ExternalInterfaceDefaultRoute: + default: '10.0.0.1' + description: default route for the external network + type: string ControlPlaneSubnetCidr: # Override this via parameter_defaults default: '24' description: The subnet CIDR of the control plane network. @@ -51,7 +71,7 @@ parameters: DnsServers: # Override this via parameter_defaults default: [] description: A list of DNS servers (2 max for some implementations) that will be added to resolv.conf. - type: json + type: comma_delimited_list EC2MetadataIp: # Override this via parameter_defaults description: The IP address of the EC2 metadata server. type: string @@ -112,6 +132,14 @@ resources: use_dhcp: false # force the MAC address of the bridge to this interface primary: true + # Uncomment when including environments/network-management.yaml + #- + # type: interface + # name: nic7 + # use_dhcp: false + # addresses: + # - + # ip_netmask: {get_param: ManagementIpSubnet} outputs: OS::stack_id: |