diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-16 12:50:27 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-16 12:50:27 -0400 |
commit | 6014e43072f1e81951a2745ab119716908d84db1 (patch) | |
tree | 6423cde932de38a43192199af830cd5a6ec5b6f7 /src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py | |
parent | 76f042e6e465af8a3fbc4fb145661c37626e9958 (diff) | |
parent | b03e1e47c9805332cd83dcc5cf3e68e0b3c8175a (diff) | |
download | bcfg2-6014e43072f1e81951a2745ab119716908d84db1.tar.gz bcfg2-6014e43072f1e81951a2745ab119716908d84db1.tar.bz2 bcfg2-6014e43072f1e81951a2745ab119716908d84db1.zip |
Merge branch 'maint'
Conflicts:
src/lib/Bcfg2/Server/Plugins/Cfg/CfgPublicKeyCreator.py
testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPrivateKeyCreator.py
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py index e5611d50b..e9698f526 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py @@ -98,7 +98,7 @@ class CfgPrivateKeyCreator(XMLCfgCreator): raise # pylint: disable=W0221 - def create_data(self, entry, metadata, return_pair=False): + def create_data(self, entry, metadata): """ Create data for the given entry on the given client :param entry: The abstract entry to create data for. This @@ -106,15 +106,7 @@ class CfgPrivateKeyCreator(XMLCfgCreator): :type entry: lxml.etree._Element :param metadata: The client metadata to create data for :type metadata: Bcfg2.Server.Plugins.Metadata.ClientMetadata - :param return_pair: Return a tuple of ``(public key, private - key)`` instead of just the private key. - This is used by - :class:`Bcfg2.Server.Plugins.Cfg.CfgPublicKeyCreator.CfgPublicKeyCreator` - to create public keys as requested. - :type return_pair: bool :returns: string - The private key data - :returns: tuple - Tuple of ``(public key, private key)``, if - ``return_pair`` is set to True """ spec = self.XMLMatch(metadata) specificity = self.get_specificity(metadata) @@ -132,11 +124,7 @@ class CfgPrivateKeyCreator(XMLCfgCreator): # return it privkey = open(filename).read() self.write_data(privkey, **specificity) - - if return_pair: - return (pubkey, privkey) - else: - return privkey + return privkey finally: shutil.rmtree(os.path.dirname(filename)) # pylint: enable=W0221 |