Merge "Log reconfiguration errors on startup" into feature/zuulv3
diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..3d10ced
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,4 @@
+- project:
+ name: openstack-infra/zuul
+ check:
+ jobs: []
diff --git a/tests/fixtures/main.yaml b/tests/fixtures/main.yaml
deleted file mode 100644
index f9ec378..0000000
--- a/tests/fixtures/main.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tenants:
- - name: openstack
- include:
- - layout.yaml
diff --git a/zuul/cmd/scheduler.py b/zuul/cmd/scheduler.py
index b9a3e81..bb27a0f 100755
--- a/zuul/cmd/scheduler.py
+++ b/zuul/cmd/scheduler.py
@@ -241,7 +241,7 @@
if scheduler.config.has_option('zuul', 'pidfile'):
pid_fn = os.path.expanduser(scheduler.config.get('zuul', 'pidfile'))
else:
- pid_fn = '/var/run/zuul/zuul.pid'
+ pid_fn = '/var/run/zuul-scheduler/zuul-scheduler.pid'
pid = pid_file_module.TimeoutPIDLockFile(pid_fn, 10)
if scheduler.args.nodaemon:
diff --git a/zuul/launcher/server.py b/zuul/launcher/server.py
index cc34187..1ba42da 100644
--- a/zuul/launcher/server.py
+++ b/zuul/launcher/server.py
@@ -799,6 +799,14 @@
config.write('action_plugins = %s\n'
% self.launcher_server.action_dir)
+ # On secure jobs, we want to prevent the printing of args,
+ # since secure jobs might have access to secrets that they may
+ # need to pass to a task or a role. On the other hand, there
+ # should be no sensitive data in insecure jobs, and printing
+ # the args could be useful for debugging.
+ config.write('display_args_to_stdout = %s\n' %
+ str(not secure))
+
config.write('[ssh_connection]\n')
# NB: when setting pipelining = True, keep_remote_files
# must be False (the default). Otherwise it apparently