From 0bfe6062a00cf004e3efa989324d23a3d2f10eaa Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Mon, 20 Nov 2017 15:23:16 -0800 Subject: [PATCH] Zuul v3: add per-service default files We're moving the default pidfile location in https://review.openstack.org/517381 This change creates default files so that when running v3, the new location is used. The init scripts themselves are still compatible with v2 and v3. Change-Id: I57c486f4506114eb0447be2014baa42fc22cc8a2 --- manifests/init.pp | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index 131a4b3..fba61fc 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -467,6 +467,32 @@ class zuul ( require => File['/var/lib/zuul/www'], } + if $zuulv3 { + file { '/etc/default/zuul-executor': + ensure => present, + mode => '0444', + content => "PIDFILE=/var/run/zuul/executor.pid\n", + } + + file { '/etc/default/zuul-scheduler': + ensure => present, + mode => '0444', + content => "PIDFILE=/var/run/zuul/scheduler.pid\n", + } + + file { '/etc/default/zuul-merger': + ensure => present, + mode => '0444', + content => "PIDFILE=/var/run/zuul/merger.pid\n", + } + + file { '/etc/default/zuul-web': + ensure => present, + mode => '0444', + content => "PIDFILE=/var/run/zuul/web.pid\n", + } + } + file { '/etc/init.d/zuul': ensure => present, owner => 'root',