jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/333836 )
Change subject: Make kafka run on Jessie ...................................................................... Make kafka run on Jessie Bug: T156101 Change-Id: Ic1f8960ed8c792687e0a1c552639c3e10e65ad8e --- D puppet/modules/kafka/files/upstart M puppet/modules/kafka/manifests/init.pp A puppet/modules/kafka/templates/systemd/kafka.erb 3 files changed, 25 insertions(+), 33 deletions(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/kafka/files/upstart b/puppet/modules/kafka/files/upstart deleted file mode 100644 index ee57a33..0000000 --- a/puppet/modules/kafka/files/upstart +++ /dev/null @@ -1,15 +0,0 @@ -##################################################################### -### THIS FILE IS MANAGED BY PUPPET -##################################################################### - -description "Kafka Broker" - -start on mediawiki-ready -respawn - -setuid kafka -setgid kafka - -env KAFKA_HEAP_OPTS="-Xmx164m -Xmx164m" - -exec /usr/bin/kafka-server-start /etc/kafka/server.properties diff --git a/puppet/modules/kafka/manifests/init.pp b/puppet/modules/kafka/manifests/init.pp index 14f103c..8b25277 100644 --- a/puppet/modules/kafka/manifests/init.pp +++ b/puppet/modules/kafka/manifests/init.pp @@ -2,6 +2,7 @@ # class kafka { require ::service + require ::mediawiki::ready_service require_package('openjdk-7-jdk') require_package('zookeeper-server') @@ -37,12 +38,6 @@ source => 'puppet:///modules/kafka/kafka.profile.sh', } - file { '/etc/init/kafka.conf': - ensure => 'present', - source => 'puppet:///modules/kafka/upstart', - mode => '0444', - } - file { '/etc/kafka/server.properties': ensure => 'present', source => 'puppet:///modules/kafka/server.properties', @@ -57,7 +52,7 @@ } exec { 'zookeeper-server-init': - command => '/usr/bin/service zookeeper-server init', + command => '/etc/init.d/zookeeper-server init', unless => '/usr/bin/test -d /var/lib/zookeeper/version-2', require => Package['zookeeper-server'] } @@ -68,16 +63,14 @@ require => Exec['zookeeper-server-init'], } - service { 'kafka': - ensure => 'running', - enable => true, - require => [ - User['kafka'], - Service['zookeeper-server'], - ], - subscribe => [ - File['/etc/init/kafka.conf'], - File['/etc/kafka/server.properties'], - ], + systemd::service { 'kafka': + ensure => 'present', + service_params => { + require => [ + User['kafka'], + Service['zookeeper-server'], + ], + subscribe => File['/etc/kafka/server.properties'], + }, } } diff --git a/puppet/modules/kafka/templates/systemd/kafka.erb b/puppet/modules/kafka/templates/systemd/kafka.erb new file mode 100644 index 0000000..c4f1ec4 --- /dev/null +++ b/puppet/modules/kafka/templates/systemd/kafka.erb @@ -0,0 +1,14 @@ +[Unit] +Description=Kafka Broker +Requires=mediawiki-ready.service +After=mediawiki-ready.service + +[Service] +User=kafka +Group=kafka +Environment=KAFKA_HEAP_OPTS=-Xmx164m -Xmx164m +ExecStart=/usr/bin/kafka-server-start /etc/kafka/server.properties +Restart=always + +[Install] +WantedBy=multi-user.target -- To view, visit https://gerrit.wikimedia.org/r/333836 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic1f8960ed8c792687e0a1c552639c3e10e65ad8e Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: jessie-migration Gerrit-Owner: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits