diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-04 15:48:05 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-04 15:48:05 -0400 |
| commit | bdcbded3236fa76f011c8d594c4b261c8b816199 (patch) | |
| tree | 23d9886731ccbf52e8f3d3d9ccc0cfeb8dbb273a /tools | |
| parent | 864bce0515b85f206381ac033875b12d06a2540d (diff) | |
| parent | 5c9cd24767bcbc8cdb39eebf2fd81e9c814c01af (diff) | |
| download | bcfg2-bdcbded3236fa76f011c8d594c4b261c8b816199.tar.gz bcfg2-bdcbded3236fa76f011c8d594c4b261c8b816199.tar.bz2 bcfg2-bdcbded3236fa76f011c8d594c4b261c8b816199.zip | |
Merge branch 'maint'
Conflicts:
doc/client/tools/actions.txt
schemas/authorizedkeys.xsd
src/lib/Bcfg2/Client/Frame.py
src/lib/Bcfg2/Server/Plugin/helpers.py
src/lib/Bcfg2/Server/Plugins/Bundler.py
testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/bcfg2_local.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/bcfg2_local.py b/tools/bcfg2_local.py index 21b5ad8d4..5e5bca777 100755 --- a/tools/bcfg2_local.py +++ b/tools/bcfg2_local.py @@ -47,7 +47,10 @@ class LocalProxy(object): func = getattr(self.core, attr) if func.exposed: def inner(*args, **kwargs): - args = ((self.ipaddr, self.hostname), ) + args + # the port portion of the addresspair tuple isn't + # actually used, so it's safe to hardcode 6789 + # here. + args = ((self.ipaddr, 6789), ) + args return func(*args, **kwargs) return inner raise AttributeError(attr) |