Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Update the capabilities map file name to be more consistent"
[apex-tripleo-heat-templates.git]
/
network
/
config
/
bond-with-vlans
/
swift-storage.yaml
diff --git
a/network/config/bond-with-vlans/swift-storage.yaml
b/network/config/bond-with-vlans/swift-storage.yaml
index
f182bae
..
de9121e
100644
(file)
--- a/
network/config/bond-with-vlans/swift-storage.yaml
+++ b/
network/config/bond-with-vlans/swift-storage.yaml
@@
-29,6
+29,10
@@
parameters:
default: ''
description: IP address/subnet on the tenant network
type: string
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: ''
description: The ovs_options string for the bond interface. Set things like
BondInterfaceOvsOptions:
default: ''
description: The ovs_options string for the bond interface. Set things like
@@
-46,6
+50,10
@@
parameters:
default: 40
description: Vlan ID for the storage mgmt network traffic.
type: number
default: 40
description: Vlan ID for the storage mgmt network traffic.
type: number
+ ManagementNetworkVlanID:
+ default: 60
+ description: Vlan ID for the management network traffic.
+ type: number
ControlPlaneSubnetCidr: # Override this via parameter_defaults
default: '24'
description: The subnet CIDR of the control plane network.
ControlPlaneSubnetCidr: # Override this via parameter_defaults
default: '24'
description: The subnet CIDR of the control plane network.
@@
-53,6
+61,10
@@
parameters:
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane network.
type: string
ControlPlaneDefaultRoute: # Override this via parameter_defaults
description: The default route of the control plane 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.
+ type: comma_delimited_list
EC2MetadataIp: # Override this via parameter_defaults
description: The IP address of the EC2 metadata server.
type: string
EC2MetadataIp: # Override this via parameter_defaults
description: The IP address of the EC2 metadata server.
type: string
@@
-69,6
+81,7
@@
resources:
type: interface
name: nic1
use_dhcp: false
type: interface
name: nic1
use_dhcp: false
+ dns_servers: {get_param: DnsServers}
addresses:
-
ip_netmask:
addresses:
-
ip_netmask:
@@
-120,6
+133,14
@@
resources:
addresses:
-
ip_netmask: {get_param: StorageMgmtIpSubnet}
addresses:
-
ip_netmask: {get_param: StorageMgmtIpSubnet}
+ # 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:
outputs:
OS::stack_id: