From 11731927392661680d2b0a5b48a1dcf19fda8675 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Wed, 22 Jun 2016 17:25:06 -0400 Subject: [PATCH] Move channel back, as it is referenced by generate_cloud_config --- buildman/manager/executor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildman/manager/executor.py b/buildman/manager/executor.py index d2e12f009..30cd0c6e6 100644 --- a/buildman/manager/executor.py +++ b/buildman/manager/executor.py @@ -111,14 +111,14 @@ class EC2Executor(BuilderExecutor): @coroutine def start_builder(self, realm, token, build_uuid): region = self.executor_config['EC2_REGION'] + channel = self.executor_config.get('COREOS_CHANNEL', 'stable') + coreos_ami = self.executor_config.get('COREOS_AMI', None) if coreos_ami is None: - channel = self.executor_config.get('COREOS_CHANNEL', 'stable') get_ami_callable = partial(self._get_coreos_ami, region, channel) coreos_ami = yield From(self._loop.run_in_executor(None, get_ami_callable)) user_data = self.generate_cloud_config(realm, token, channel, self.manager_hostname) - logger.debug('Generated cloud config: %s', user_data) ec2_conn = self._get_conn()