Revert "Bug 545 - Added exemplary TLS configuration"

This reverts commit 8d5aced73d32bcadc6dbd0a8229db797448fe1dd.

Change-Id: Ia2dffab4f4af5fcea0dba5ecb867682a32a070c6
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin.xml b/openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin.xml
index 4c9c4c1d31810899c22472511f66868705ef8ace..7c9214518103ac371bc041e45c5ab7263b3b03f5 100644 (file)
--- a/openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin.xml
+++ b/openflowplugin-controller-config/src/main/resources/initial/42-openflowplugin.xml
@@ -28,50 +28,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
           <name>openflow-switch-connection-provider-default-impl</name>
           <port>6633</port>
           <switch-idle-timeout>15000</switch-idle-timeout>
-<!--           Exemplary TLS configuration:
-                - uncomment the <tls> tag
-                - copy switch-privkey.pem, switch-cert.pem and cacert.pem files into your virtual machine
-                - set VM encryption options to use copied keys
-                - start communication
-               Please visit OpenflowPlugin or Openflow Protocol Library#Documentation wiki pages
-               for detailed information regarding TLS -->
-<!--           <tls>
-                 <keystore>/exemplary-ctlKeystore</keystore>
-                 <keystore-type>JKS</keystore-type>
-                 <keystore-path-type>CLASSPATH</keystore-path-type>
-                 <keystore-password>opendaylight</keystore-password>
-                 <truststore>/exemplary-ctlTrustStore</truststore>
-                 <truststore-type>JKS</truststore-type>
-                 <truststore-path-type>CLASSPATH</truststore-path-type>
-                 <truststore-password>opendaylight</truststore-password>
-                 <certificate-password>opendaylight</certificate-password>
-               </tls>
-        </module> -->
+        </module>
         <!-- default OF-switch-connection-provider (port 6653) -->
         <module>
           <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:provider:impl">prefix:openflow-switch-connection-provider-impl</type>
           <name>openflow-switch-connection-provider-legacy-impl</name>
           <port>6653</port>
           <switch-idle-timeout>15000</switch-idle-timeout>
-<!--           Exemplary TLS configuration:
-                - uncomment the <tls> tag
-                - copy switch-privkey.pem, switch-cert.pem and cacert.pem files into your virtual machine
-                - set VM encryption options to use copied keys
-                - start communication
-               Please visit OpenflowPlugin or Openflow Protocol Library#Documentation wiki pages
-               for detailed information regarding TLS -->
-<!--           <tls>
-                 <keystore>/exemplary-ctlKeystore</keystore>
-                 <keystore-type>JKS</keystore-type>
-                 <keystore-path-type>CLASSPATH</keystore-path-type>
-                 <keystore-password>opendaylight</keystore-password>
-                 <truststore>/exemplary-ctlTrustStore</truststore>
-                 <truststore-type>JKS</truststore-type>
-                 <truststore-path-type>CLASSPATH</truststore-path-type>
-                 <truststore-password>opendaylight</truststore-password>
-                 <certificate-password>opendaylight</certificate-password>
-               </tls>
-        </module> -->
         </module>