summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Options
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2014-10-15 16:25:12 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2014-10-15 17:05:26 +0200
commit1aeff29bfb5fb35c075c310e0af235ccf286fc48 (patch)
treee2d1edd5bae370a2a5a91abff8bfa2c2250e38f8 /src/lib/Bcfg2/Options
parent45e07c7714116b7b88c40a55728be0c0b3c8a0fb (diff)
downloadbcfg2-1aeff29bfb5fb35c075c310e0af235ccf286fc48.tar.gz
bcfg2-1aeff29bfb5fb35c075c310e0af235ccf286fc48.tar.bz2
bcfg2-1aeff29bfb5fb35c075c310e0af235ccf286fc48.zip
Options: add missing communication:protocol options
The option was there in bcfg2-1.3.x and is still documented (maybe it just got lost during the options rewrite).
Diffstat (limited to 'src/lib/Bcfg2/Options')
-rw-r--r--src/lib/Bcfg2/Options/Common.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Options/Common.py b/src/lib/Bcfg2/Options/Common.py
index 06e2d2914..a6ea136c3 100644
--- a/src/lib/Bcfg2/Options/Common.py
+++ b/src/lib/Bcfg2/Options/Common.py
@@ -111,6 +111,12 @@ class Common(object):
ssl_ca = PathOption(
cf=('communication', 'ca'), help='Path to SSL CA Cert')
+ #: Communication protocol
+ protocol = Option(
+ cf=('communication', 'protocol'), default='xmlrpc/ssl',
+ choices=['xmlrpc/ssl', 'xmlrpc/tlsv1'],
+ help='Communication protocol to use.')
+
#: Default Path paranoid setting
default_paranoid = Option(
cf=('mdata', 'paranoid'), dest="default_paranoid", default='true',