diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-19 10:19:38 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-20 13:44:28 +0000 |
| commit | 5cbda921714c39075abb2eb37386f46100ef0b07 (patch) | |
| tree | 40cfa90bbced9405f6fa92959a4bf2bedf1f1323 | |
| parent | eaf7508d09cea4c89a666d5ea1f38cdd73f09749 (diff) | |
| download | infrastructure-5cbda921714c39075abb2eb37386f46100ef0b07.tar.gz | |
Move Zuul configuration to the location Zuul expects it to be
Zuul expects its configuration to be in /etc/zuul/zuul.conf, if it lives
in /etc/zuul.conf then I have to pass `-c /etc/zuul.conf` to the
commandline tool each time I run it, which is annoying.
| -rw-r--r-- | mason/ansible/mason-setup.yml | 4 | ||||
| -rw-r--r-- | mason/share/zuul/zuul-logging.conf (renamed from mason/share/zuul-logging.conf) | 0 | ||||
| -rw-r--r-- | mason/share/zuul/zuul.conf (renamed from mason/share/zuul.conf) | 2 | ||||
| -rw-r--r-- | mason/zuul-merger.service | 2 | ||||
| -rw-r--r-- | mason/zuul-server.service | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/mason/ansible/mason-setup.yml b/mason/ansible/mason-setup.yml index c1989b5e..b67e8daf 100644 --- a/mason/ansible/mason-setup.yml +++ b/mason/ansible/mason-setup.yml @@ -86,11 +86,11 @@ - name: Create required configuration files template: src=/usr/share/mason-setup/{{ item }} dest=/etc/{{ item }} with_items: - - zuul.conf + - zuul/zuul.conf - turbo-hipster-config.yaml - lighttpd.conf - zuul-layout.yaml - - zuul-logging.conf + - zuul/zuul-logging.conf - name: Create the OpenStack credentials file template: src=/usr/share/mason-setup/{{ item }} dest=/etc/{{ item }} diff --git a/mason/share/zuul-logging.conf b/mason/share/zuul/zuul-logging.conf index 8b76da26..8b76da26 100644 --- a/mason/share/zuul-logging.conf +++ b/mason/share/zuul/zuul-logging.conf diff --git a/mason/share/zuul.conf b/mason/share/zuul/zuul.conf index 21066e70..3cf9e8f6 100644 --- a/mason/share/zuul.conf +++ b/mason/share/zuul/zuul.conf @@ -13,7 +13,7 @@ user={{ GERRIT_USER }} sshkey={{ GERRIT_SSH_KEY_PATH }} [zuul] -log_config=/etc/zuul-logging.conf +log_config=/etc/zuul/zuul-logging.conf pidfile=/var/run/zuul/zuul.pid state_dir=/var/lib/zuul git_dir=/var/lib/zuul/git diff --git a/mason/zuul-merger.service b/mason/zuul-merger.service index a3aa0ca5..a59bdfe4 100644 --- a/mason/zuul-merger.service +++ b/mason/zuul-merger.service @@ -4,7 +4,7 @@ After=zuul-server.service [Service] User=root -ExecStart=/usr/bin/zuul-merger -d -c /etc/zuul.conf +ExecStart=/usr/bin/zuul-merger -d -c /etc/zuul/zuul.conf [Install] WantedBy=multi-user.target diff --git a/mason/zuul-server.service b/mason/zuul-server.service index dfc6436f..c2967706 100644 --- a/mason/zuul-server.service +++ b/mason/zuul-server.service @@ -4,7 +4,7 @@ After=mason-setup.service [Service] User=root -ExecStart=/usr/bin/zuul-server -d -c /etc/zuul.conf -l /etc/zuul-layout.yaml +ExecStart=/usr/bin/zuul-server -d -c /etc/zuul/zuul.conf -l /etc/zuul-layout.yaml [Install] WantedBy=multi-user.target |