diff options
| author |   Dan Sneddon <dsneddon@redhat.com> | 2016-04-21 15:45:25 -0700 |
|---|---|---|
| committer | Dan Sneddon <dsneddon@redhat.com> | 2016-04-21 15:45:25 -0700 |
| commit | 6d27813db3ce06b4352ac42c3e45887030094c39 (patch) | |
| tree | ef5519a81832b1299b82179a324ffc58d4d083ea /network/config/bond-with-vlans | |
| parent | 55cd264439f5aa9f58310e9215dbaf4bd76cf329 (diff) | |
Fix controller-no-external.yaml in bonded configs.
For some reason the controller-no-external.yaml template is configured
for DHCP on the control plane interface. We switched to static control
plane IPs before the controller-no-external.yaml was created (IIRC), so
I'm not sure how that happened. This change brings the
controller-no-external.yaml in line with the rest of the bonded NIC
templates.
Change-Id: I2ac929e241707db72a0beabf9d5cd7fc14b90f76
Diffstat (limited to 'network/config/bond-with-vlans')
| -rw-r--r-- | network/config/bond-with-vlans/controller-no-external.yaml | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/network/config/bond-with-vlans/controller-no-external.yaml b/network/config/bond-with-vlans/controller-no-external.yaml index 375d40be..d9532439 100644 --- a/network/config/bond-with-vlans/controller-no-external.yaml +++ b/network/config/bond-with-vlans/controller-no-external.yaml @@ -5,6 +5,10 @@ description: > with VLANs attached for the controller role. parameters: + ControlPlaneIp: + default: '' + description: IP address/subnet on the ctlplane network + type: string ExternalIpSubnet: default: '' description: IP address/subnet on the external network @@ -62,6 +66,18 @@ parameters: 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. + 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 + resources: OsNetConfigImpl: @@ -72,6 +88,21 @@ resources: os_net_config: network_config: - + type: interface + name: nic1 + use_dhcp: false + addresses: + - + ip_netmask: + list_join: + - '/' + - - {get_param: ControlPlaneIp} + - {get_param: ControlPlaneSubnetCidr} + routes: + - + ip_netmask: 169.254.169.254/32 + next_hop: {get_param: EC2MetadataIp} + - type: ovs_bridge name: {get_input: bridge_name} use_dhcp: true |