aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-21 14:23:00 +0000
committerGerrit Code Review <review@openstack.org>2016-11-21 14:23:00 +0000
commit6878d9ced7b4953d70d779b5084a0f16ba031431 (patch)
treeeaf257fd4a2f5f53dc8e35264221b8a567abd0b5
parent9971eb3af988b1f7c003048af161489ab79b1b0c (diff)
parent71ba53264dc2835965bad2f5bd262a45cc67974d (diff)
Merge "Add sample files for fail_mode and ovs_extra template"
-rw-r--r--etc/os-net-config/samples/bridge_fail_mode.json15
-rw-r--r--etc/os-net-config/samples/bridge_fail_mode.yaml10
-rw-r--r--etc/os-net-config/samples/bridge_ovs_extra.json18
-rw-r--r--etc/os-net-config/samples/bridge_ovs_extra.yaml12
4 files changed, 55 insertions, 0 deletions
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