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

Fix the python requirements. Add the ability to map in etcd client certs and ca.

Browse source
This commit is contained in:
Jake Moshenko 2015-01-22 10:53:23 -05:00
parent 44f7ab53a2
commit f2471a86f6
6 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
buildman/manager/executor.py
View file

@ -53,22 +53,18 @@ class BuilderExecutor(object):
return 'ws://{0}:'
def generate_cloud_config(self, realm, token, coreos_channel, manager_hostname,
quay_username=None, quay_password=None, etcd_token=None):
quay_username=None, quay_password=None):
if quay_username is None:
quay_username = self.executor_config['QUAY_USERNAME']
if quay_password is None:
quay_password = self.executor_config['QUAY_PASSWORD']
if etcd_token is None:
etcd_token = self.executor_config['ETCD_DISCOVERY_TOKEN']
return TEMPLATE.render(
realm=realm,
token=token,
quay_username=quay_username,
quay_password=quay_password,
etcd_token=etcd_token,
manager_hostname=manager_hostname,
coreos_channel=coreos_channel,
)