From 6285b7955c2ddb35c9b1e5e990ac94bbc7a33144 Mon Sep 17 00:00:00 2001 From: Evgeniy L Date: Tue, 27 Oct 2015 17:14:14 +0300 Subject: [PATCH] Use BatTransport instead of ssh to get discovery info --- examples/provisioning/provision.py | 6 +++--- solar/solar/core/transports/bat.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/provisioning/provision.py b/examples/provisioning/provision.py index 6178a002..e69aa082 100755 --- a/examples/provisioning/provision.py +++ b/examples/provisioning/provision.py @@ -5,13 +5,13 @@ import json import requests from solar.core.resource import virtual_resource as vr -from solar.core.transports.ssh import SSHRunTransport +from solar.core.transports.bat import BatRunTransport from solar.events.api import add_event from solar.events.controls import React -transport_run = SSHRunTransport() +transport_run = BatRunTransport() discovery_service = 'http://0.0.0.0:8881' @@ -35,7 +35,7 @@ def feed_discovery(mac, ohai_data): base_url=discovery_service, mac=mac, ), - json=ohai_data, + data=json.dumps(ohai_data), ) nodes_list = requests.get(discovery_service).json() diff --git a/solar/solar/core/transports/bat.py b/solar/solar/core/transports/bat.py index 4ff6f6a6..3814738c 100644 --- a/solar/solar/core/transports/bat.py +++ b/solar/solar/core/transports/bat.py @@ -54,6 +54,7 @@ class BatTransport(SolarTransport): super(BatTransport, self).__init__(*args, **kwargs) self._cache = {} self._used_transports = [] + self._other_remember = None def select_valid_transport(self, resource, *args, **kwargs): key_name = '_bat_transport_%s' % self._mode @@ -114,4 +115,3 @@ class BatRunTransport(RunTransport, BatTransport): def run(self, resource, *args, **kwargs): transport = self.select_valid_transport(resource) return transport.run(resource, *args, **kwargs) -