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/bond-with-vlans/controller.yaml | |
| parent | c40f2a3b67274e9c7133ce9fd44d8635a8aa4674 (diff) | |
| parent | 15bb67261a333f140f21208e20a112b99eeb609c (diff) | |
Merge "Add Management Network For System Administration."
Diffstat (limited to 'network/config/bond-with-vlans/controller.yaml')
| -rw-r--r-- | network/config/bond-with-vlans/controller.yaml | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/network/config/bond-with-vlans/controller.yaml b/network/config/bond-with-vlans/controller.yaml index eb4399ea..d3627ead 100644 --- a/network/config/bond-with-vlans/controller.yaml +++ b/network/config/bond-with-vlans/controller.yaml @@ -29,6 +29,10 @@ 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 BondInterfaceOvsOptions: default: 'bond_mode=active-backup' description: The ovs_options string for the bond interface. Set things like @@ -54,6 +58,10 @@ parameters: 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 @@ -119,7 +127,7 @@ resources: ip_netmask: {get_param: ExternalIpSubnet} routes: - - ip_netmask: 0.0.0.0/0 + default: true next_hop: {get_param: ExternalInterfaceDefaultRoute} - type: vlan @@ -149,6 +157,14 @@ resources: addresses: - ip_netmask: {get_param: TenantIpSubnet} + # Uncomment when including environments/network-management.yaml + #- + # type: vlan + # device: bond1 + # vlan_id: {get_param: ManagementNetworkVlanID} + # addresses: + # - + # ip_netmask: {get_param: ManagementIpSubnet} outputs: OS::stack_id: |