diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-03-04 19:29:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-03-04 19:29:15 +0000 |
| commit | 4cf8c1a0fd3c029ea81092a8901d786bfce77735 (patch) | |
| tree | d2f8f23dd3e603b85693998d0b86eeb2ffd65df6 /etc | |
| parent | 3d6c45c571503122741233a27a9e43c2fb56ecac (diff) | |
| parent | 19d4ef7a498fe0dc733f62b8feb3978c33d22be8 (diff) | |
Merge "Strip trailing whitespace from yaml samples"
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/os-net-config/samples/bond.yaml | 10 | ||||
| -rw-r--r-- | etc/os-net-config/samples/bridge_dhcp.yaml | 6 | ||||
| -rw-r--r-- | etc/os-net-config/samples/bridge_vlan.yaml | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/etc/os-net-config/samples/bond.yaml b/etc/os-net-config/samples/bond.yaml index 7b925a7..7b8b4ec 100644 --- a/etc/os-net-config/samples/bond.yaml +++ b/etc/os-net-config/samples/bond.yaml @@ -1,17 +1,17 @@ network_config: - - + - type: ovs_bridge name: br-ctlplane use_dhcp: true - members: - - + members: + - type: ovs_bond name: bond1 use_dhcp: true members: - - + - type: interface name: em1 - - + - type: interface name: em2 diff --git a/etc/os-net-config/samples/bridge_dhcp.yaml b/etc/os-net-config/samples/bridge_dhcp.yaml index aad4435..a6ac593 100644 --- a/etc/os-net-config/samples/bridge_dhcp.yaml +++ b/etc/os-net-config/samples/bridge_dhcp.yaml @@ -1,11 +1,11 @@ network_config: - - + - type: ovs_bridge name: br-ctlplane use_dhcp: true - ovs_extra: + ovs_extra: - br-set-external-id br-ctlplane bridge-id br-ctlplane members: - - + - type: interface name: em1 diff --git a/etc/os-net-config/samples/bridge_vlan.yaml b/etc/os-net-config/samples/bridge_vlan.yaml index a17d61e..fdf9041 100644 --- a/etc/os-net-config/samples/bridge_vlan.yaml +++ b/etc/os-net-config/samples/bridge_vlan.yaml @@ -1,19 +1,19 @@ network_config: - - + - type: ovs_bridge name: br-ctlplane use_dhcp: true members: - - + - type: interface name: em1 - - + - type: vlan vlan_id: 16 addresses: - - + - ip_netmask: 192.0.2.1/24 routes: - - + - next_hop: 192.0.2.1 ip_netmask: 192.0.2.1/24 |