diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-25 00:52:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-25 00:52:55 +0000 |
| commit | e22fa39e7855b2763726340ec74ea18efb91af9c (patch) | |
| tree | 52683e0442e142d069a0b9871e1c2a584da31b14 /network/config/multiple-nics/ceph-storage.yaml | |
| parent | a6044b2ba9933e05b7b4685c4863c70410238bfe (diff) | |
| parent | 5aabce1091cbb73887914d6900f06d5a5069d97c (diff) | |
Merge "Updates and fixes to NIC config template routes"
Diffstat (limited to 'network/config/multiple-nics/ceph-storage.yaml')
| -rw-r--r-- | network/config/multiple-nics/ceph-storage.yaml | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/network/config/multiple-nics/ceph-storage.yaml b/network/config/multiple-nics/ceph-storage.yaml index 84cb0f12..c31c6e65 100644 --- a/network/config/multiple-nics/ceph-storage.yaml +++ b/network/config/multiple-nics/ceph-storage.yaml @@ -57,10 +57,6 @@ parameters: 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. @@ -68,6 +64,14 @@ parameters: ControlPlaneDefaultRoute: # Override this via parameter_defaults description: The default route of the control plane network. type: string + ExternalInterfaceDefaultRoute: # Not used by default in this template + default: '10.0.0.1' + description: The default route of the external network. + type: string + ManagementInterfaceDefaultRoute: # Commented out by default in this template + default: unset + description: The default route of the management network. + type: string 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. @@ -118,6 +122,8 @@ resources: - ip_netmask: {get_param: StorageMgmtIpSubnet} # Uncomment when including environments/network-management.yaml + # If setting default route on the Management interface, comment + # out the default route on the Control Plane. #- # type: interface # name: nic7 @@ -125,6 +131,10 @@ resources: # addresses: # - # ip_netmask: {get_param: ManagementIpSubnet} + # routes: + # - + # default: true + # next_hop: {get_param: ManagementInterfaceDefaultRoute} outputs: OS::stack_id: |