From 71ba53264dc2835965bad2f5bd262a45cc67974d Mon Sep 17 00:00:00 2001 From: Brent Eagles Date: Tue, 15 Nov 2016 15:18:25 -0330 Subject: Add sample files for fail_mode and ovs_extra template This patch adds sample json and yaml for: - setting the OVS bridge fail mode using the new ovs_fail_mode option - using the {name} replacement feature for ovs_extra data for inserting the bridge name in configuration data Change-Id: I2af32edbba0b635207888ad0502b2296f502c274 --- etc/os-net-config/samples/bridge_fail_mode.json | 15 +++++++++++++++ etc/os-net-config/samples/bridge_fail_mode.yaml | 10 ++++++++++ etc/os-net-config/samples/bridge_ovs_extra.json | 18 ++++++++++++++++++ etc/os-net-config/samples/bridge_ovs_extra.yaml | 12 ++++++++++++ 4 files changed, 55 insertions(+) create mode 100644 etc/os-net-config/samples/bridge_fail_mode.json create mode 100644 etc/os-net-config/samples/bridge_fail_mode.yaml create mode 100644 etc/os-net-config/samples/bridge_ovs_extra.json create mode 100644 etc/os-net-config/samples/bridge_ovs_extra.yaml diff --git a/etc/os-net-config/samples/bridge_fail_mode.json b/etc/os-net-config/samples/bridge_fail_mode.json new file mode 100644 index 0000000..6492da6 --- /dev/null +++ b/etc/os-net-config/samples/bridge_fail_mode.json @@ -0,0 +1,15 @@ +{ "network_config": [ + { + "type": "ovs_bridge", + "name": "br-ctlplane", + "ovs_fail_mode": "secure", + "use_dhcp": "true", + "members": [ + { + "type": "interface", + "name": "em1" + } + ] + } + ] +} diff --git a/etc/os-net-config/samples/bridge_fail_mode.yaml b/etc/os-net-config/samples/bridge_fail_mode.yaml new file mode 100644 index 0000000..7589c25 --- /dev/null +++ b/etc/os-net-config/samples/bridge_fail_mode.yaml @@ -0,0 +1,10 @@ +network_config: + - + type: ovs_bridge + name: br-ctlplane + use_dhcp: true + ovs_fail_mode: secure + members: + - + type: interface + name: em1 diff --git a/etc/os-net-config/samples/bridge_ovs_extra.json b/etc/os-net-config/samples/bridge_ovs_extra.json new file mode 100644 index 0000000..d71ead5 --- /dev/null +++ b/etc/os-net-config/samples/bridge_ovs_extra.json @@ -0,0 +1,18 @@ +{ "network_config": [ + { + "type": "ovs_bridge", + "name": "br-ctlplane", + "ovs_extra": [ + "br-set-external-id br-ctlplane bridge-id br-ctlplane", + "set bridge {name} stp_enable=true" + ], + "use_dhcp": "true", + "members": [ + { + "type": "interface", + "name": "em1" + } + ] + } + ] +} diff --git a/etc/os-net-config/samples/bridge_ovs_extra.yaml b/etc/os-net-config/samples/bridge_ovs_extra.yaml new file mode 100644 index 0000000..e369d62 --- /dev/null +++ b/etc/os-net-config/samples/bridge_ovs_extra.yaml @@ -0,0 +1,12 @@ +network_config: + - + type: ovs_bridge + name: br-ctlplane + use_dhcp: true + ovs_extra: + - br-set-external-id br-ctlplane bridge-id br-ctlplane + - set bridge {name} stp_enable=true + members: + - + type: interface + name: em1 -- cgit 1.2.3-korg