vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move channel back, as it is referenced by generate_cloud_config

Browse source
This commit is contained in:
Joseph Schorr 2016-06-22 17:25:06 -04:00
parent 46ea7ce2ed
commit 1173192739
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
buildman/manager/executor.py
View file

@ -111,14 +111,14 @@ class EC2Executor(BuilderExecutor):
@coroutine @coroutine
def start_builder(self, realm, token, build_uuid): def start_builder(self, realm, token, build_uuid):
region = self.executor_config['EC2_REGION'] region = self.executor_config['EC2_REGION']
channel = self.executor_config.get('COREOS_CHANNEL', 'stable')
coreos_ami = self.executor_config.get('COREOS_AMI', None) coreos_ami = self.executor_config.get('COREOS_AMI', None)
if coreos_ami is None: if coreos_ami is None:
channel = self.executor_config.get('COREOS_CHANNEL', 'stable')
get_ami_callable = partial(self._get_coreos_ami, region, channel) get_ami_callable = partial(self._get_coreos_ami, region, channel)
coreos_ami = yield From(self._loop.run_in_executor(None, get_ami_callable)) 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) user_data = self.generate_cloud_config(realm, token, channel, self.manager_hostname)
logger.debug('Generated cloud config: %s', user_data) logger.debug('Generated cloud config: %s', user_data)
ec2_conn = self._get_conn() ec2_conn = self._get_conn()