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/swift-storage.yaml | |
| parent | c40f2a3b67274e9c7133ce9fd44d8635a8aa4674 (diff) | |
| parent | 15bb67261a333f140f21208e20a112b99eeb609c (diff) | |
Merge "Add Management Network For System Administration."
Diffstat (limited to 'network/config/multiple-nics/swift-storage.yaml')
| -rw-r--r-- | network/config/multiple-nics/swift-storage.yaml | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/network/config/multiple-nics/swift-storage.yaml b/network/config/multiple-nics/swift-storage.yaml index b7c2e9a3..4d5a7b99 100644 --- a/network/config/multiple-nics/swift-storage.yaml +++ b/network/config/multiple-nics/swift-storage.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 ExternalNetworkVlanID: default: 10 description: Vlan ID for the external network traffic. @@ -49,6 +53,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 @@ -63,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 @@ -116,6 +124,14 @@ resources: addresses: - ip_netmask: {get_param: InternalApiIpSubnet} + # Uncomment when including environments/network-management.yaml + #- + # type: interface + # name: nic7 + # use_dhcp: false + # addresses: + # - + # ip_netmask: {get_param: ManagementIpSubnet} outputs: OS::stack_id: |