Merge "Fix kmip plugin"

barbican/plugin/kmip_secret_store.py

@@ -56,12 +56,12 @@ kmip_opts = [
                default='localhost',
                help=u._('Address of the KMIP server')
                ),
-    cfg.StrOpt('port',
-               default='5696',
+    cfg.IntOpt('port',
+               default=5696,
                help=u._('Port for the KMIP server'),
                ),
     cfg.StrOpt('ssl_version',
-               default='PROTOCOL_TLSv1',
+               default='PROTOCOL_TLSv1_2',
                help=u._('SSL version, maps to the module ssl\'s constants'),
                ),
     cfg.StrOpt('ca_certs',

etc/barbican/barbican.conf

@@ -316,9 +316,9 @@ port = 5696
 keyfile = '/path/to/certs/cert.key'
 certfile = '/path/to/certs/cert.crt'
 ca_certs = '/path/to/certs/LocalCA.crt'
-
-# User friendly plugin name
-# plugin_name = 'KMIP HSM'
+ssl_version = 'PROTOCOL_TLSv1_2'
+pkcs1_only = False
+plugin_name = 'KMIP HSM'
 
 
 # ================= Certificate plugin ===================