Merge branch 'master' into git

buildman/manager/ephemeral.py

@@ -157,8 +157,12 @@ class EphemeralBuilderManager(BaseManager):
 
     etcd_host = self._manager_config.get('ETCD_HOST', '127.0.0.1')
     etcd_port = self._manager_config.get('ETCD_PORT', 2379)
-    etcd_auth = self._manager_config.get('ETCD_CERT_AND_KEY', None)
     etcd_ca_cert = self._manager_config.get('ETCD_CA_CERT', None)
+
+    etcd_auth = self._manager_config.get('ETCD_CERT_AND_KEY', None)
+    if etcd_auth is not None:
+      etcd_auth = tuple(etcd_auth)  # Convert YAML list to a tuple
+
     etcd_protocol = 'http' if etcd_auth is None else 'https'
     logger.debug('Connecting to etcd on %s:%s', etcd_host, etcd_port)
 

buildman/manager/executor.py

@@ -69,6 +69,7 @@ class BuilderExecutor(object):
         manager_hostname=manager_hostname,
         coreos_channel=coreos_channel,
         worker_tag=self.executor_config['WORKER_TAG'],
+        logentries_token=self.executor_config.get('LOGENTRIES_TOKEN', None),
     )
 
 

buildman/templates/cloudconfig.yaml

@@ -12,6 +12,9 @@ write_files:
     REALM={{ realm }}
     TOKEN={{ token }}
     SERVER=wss://{{ manager_hostname }}
+    {% if logentries_token -%}
+    LOGENTRIES_TOKEN={{ logentries_token }}
+    {%- endif %}
 
 coreos:
   update:
@@ -19,6 +22,17 @@ coreos:
     group: {{ coreos_channel }}
 
   units:
+    - name: systemd-journal-gatewayd.socket
+      command: start
+      enable: yes
+      content: |
+        [Unit]
+        Description=Journal Gateway Service Socket
+        [Socket]
+        ListenStream=/var/run/journald.sock
+        Service=systemd-journal-gatewayd.service
+        [Install]
+        WantedBy=sockets.target
     {{ dockersystemd('quay-builder',
                      'quay.io/coreos/registry-build-worker',
                      quay_username,
@@ -29,3 +43,10 @@ coreos:
                      flattened=True,
                      restart_policy='no'
                     ) | indent(4) }}
+    {% if logentries_token -%}
+    {{ dockersystemd('builder-logs',
+                     'quay.io/kelseyhightower/journal-2-logentries',
+                     extra_args='--env-file /root/overrides.list -v /run/journald.sock:/run/journald.sock',
+                     after_units=['quay-builder.service']
+                     ) | indent(4) }}
+    {%- endif %}