Add docs for ODL OVSDB enable/disable L3 param

Adds docs for enable_l3 param.

Relevant to #87.

Change-Id: I11570dca605910de5e74846db6e6d80f22d80e98
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/README.markdown b/README.markdown
index e4944d860043505b082ee2c064b76bde916e1921..65289d34a11d1f0b46872e1755de84043c947d31 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -14,6 +14,8 @@
   * [Karaf Features](#karaf-features)
   * [Install Method](#install-method)
   * [Ports](#ports)
+  * [Log Verbosity](#log-verbosity)
+  * [Enabling ODL OVSDB L3](#enabling-odl-ovsdb-l3)
 1. [Reference ](#reference)
 1. [Limitations](#limitations)
 1. [Development](#development)
@@ -171,6 +173,16 @@ class { 'opendaylight':
 }
 ```
 
+### Enabling ODL OVSDB L3
+
+To enable the ODL OVSDB L3, use the `enable_l3` flag. It's disabled by default.
+
+```puppet
+class { 'opendaylight':
+  enable_l3 => 'yes',
+}
+```
+
 ## Reference
 
 ### Classes
@@ -269,6 +281,33 @@ org.opendaylight.ovsdb.lib | INFO
 
 The main log output file is `/opt/opendaylight/data/log/karaf.log`.
 
+##### `enable_l3`
+
+Enable or disable ODL OVSDB L3 forwarding.
+
+Default: `'no'`
+
+Valid options: The strings 'yes' or 'no'.
+
+Boolean values are not currently supported, but that feature may be added.
+
+The ODL OVSDB L3 config in `/opt/opendaylight/etc/custom.properties` is set to
+the value of the `enable_l3` param.
+
+A manifest like
+
+```puppet
+class { 'opendaylight':
+  enable_l3 => 'yes',
+}
+```
+
+Would would result in
+
+```
+ovsdb.l3.fwd.enabled=yes
+```
+
 ##### `tarball_url`
 
 Specifies the ODL tarball to use when installing via the tarball install

diff --git a/manifests/init.pp b/manifests/init.pp
index c0a134add8c37fb9943aa872fa9a5830906b4019..b8308d82cc95686c583b0acf120426e5a4da7f66 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -15,6 +15,8 @@
 #   If installing from a tarball, use this one. Defaults to latest ODL.
 # [*unitfile_url*]
 #   OpenDaylight .service file to use for tarball installs. Defaults to one used by ODL RPM.
+# [*enable_l3*]
+#   Enable or disable ODL OVSDB ML2 L3 forwarding. Valid options are 'yes' and 'no'.
 # [*log_levels*]
 #   Custom OpenDaylight logger verbosity configuration (TRACE, DEBUG, INFO, WARN, ERROR).
 #

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index f83459a718b784d0a44c1fa71aa32f9059ef5cd6..7570176d3f3f1ac89be08816c915aec3664c1c83 100644 (file)
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -123,7 +123,6 @@ describe 'opendaylight class' do
     end
   end
 
-
   describe 'testing ODL OVSDB L3 config' do
     context 'using enable_l3 default' do
       # Call specialized helper fn to install OpenDaylight