Skip to content

Commit

Permalink
Update kafka to 389fd55d0e75b23e00aa4915babfb74a4bc5508a
Browse files Browse the repository at this point in the history
389fd55d0e75b23e00aa4915babfb74a4bc5508a Merge pull request redhat-openstack#28 from puppet-community/v1.0.2
435b119d65c88cae357e114565f071f2104d9356 Runuser doesn't exist in Ubuntu12.*/14.*, using su instead
bca320563f40b3aa6b046a55b8e105f5275a6e52 Bump version, Update changelog
bf01ba9aa1df9076ec40fbb5d22d3cd529162fb2 Update badges for Puppet Forge and Travis CI
51d70424d048ab626572f6b699ffa71f13cc8ff8 Add whitespace for better preview at dillinger.io
44ea22811d47899c88a1cb1788cc0d0c5b896c3b Add missing entry at the changelog

Change-Id: I30db095e0eec71ec0ad106944e7842bc594dcd81
  • Loading branch information
xbezdick committed Dec 15, 2015
1 parent 1ea9339 commit cb8f86b
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ mod 'java',
:git => 'http://github.com/puppetlabs/puppetlabs-java'

mod 'kafka',
:commit => 'b27236dbc10715c0c473746f1d3b1e569644dff5',
:commit => '389fd55d0e75b23e00aa4915babfb74a4bc5508a',
:git => 'https://github.com/puppet-community/puppet-kafka.git'

mod 'keepalived',
Expand Down
54 changes: 39 additions & 15 deletions kafka/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,45 +1,69 @@
##2014-10-10 - Release 1.0.0
###Summary
## 2015-12-10 - Release 1.0.2
### Summary

This release adds a number of new features and fixes lots of idempotency issues.
The main additions with this release are support for installing and configuring consumers, producers and mirrors
This release fixes some issues regarding the init script. For example the
service is started as user kafka, uses su instead of runuser and will remove
stale pid files.

####Features
### Features

- Replace ensure_resource with explicit conditional.
- Update readme with an example of use.

### Bugfixes

- Make Beaker run on CentOS. This closes #5.
- Update init script of Kafka broker. This closes #17 and #26.
- Added missing dependency on puppetlabs-java. This closes #27.
- Using su instead of runuser. This closes #22 and #24.

## 2015-03-24 - Release 1.0.1
### Summary

Adding deploy section for Travis CI.

## 2014-10-10 - Release 1.0.0
### Summary

This release adds a number of new features and fixes lots of idempotency issues.
The main additions with this release are support for installing and configuring consumers, producers and mirrors

#### Features

- added support for adding topics
- added support for managing consumers, producers, and mirrors
- improved documentation
- improved testing

####Bugfixes
#### Bugfixes

- updated install_dir to /opt
- fixing install_dir symlink
- fixing idempotency issue in kafka server.properties
- fixing idempotency issue with untar-ing kafka package
- fixing bug in service restart

##2014-06-02 - Release 0.2.1
###Summary
## 2014-06-02 - Release 0.2.1
### Summary

This is a bugfix release to fix conflict with wget dependency

####Bugfixes
#### Bugfixes

- Fixing conflict with maestrodev/wget in how it is installed causing issue with duplicate resource.

##2014-06-02 - Release 0.2.0
###Summary
## 2014-06-02 - Release 0.2.0
### Summary

This release fixed some bugs with the kafka service and refactored the code in preparation of supporting things other than the broker.

####Features
#### Features
- refactoring of the kafka installation

####Bugfixes
#### Bugfixes
- fixing issue with kafka service not starting correctly.

##2014-05-27 - Release 0.1.0
###Summary
## 2014-05-27 - Release 0.1.0
### Summary

Initial release. Support for the installation and configuration of a kafka broker
3 changes: 1 addition & 2 deletions kafka/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@

The kafka module for managing the installation and configuration of [Apache Kafka](http://kafka.apache.org)

[![Build
Status](https://secure.travis-ci.org/puppet-community/puppet-kafka.png)](https://secure.travis-ci.org/puppet-community/puppet-kafka.png)
[![Puppet Forge](http://img.shields.io/puppetforge/v/puppet/kafka.svg)](https://forge.puppetlabs.com/puppet/kafka) [![Build Status](https://travis-ci.org/puppet-community/puppet-kafka.png?branch=master)](https://travis-ci.org/puppet-community/puppet-kafka)

##Module Description

Expand Down
2 changes: 1 addition & 1 deletion kafka/metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppet-kafka",
"version": "1.0.1",
"version": "1.0.2",
"author": "puppet",
"license": "Apache 2.0",
"summary": "Module for managing apache kafka",
Expand Down
2 changes: 1 addition & 1 deletion kafka/templates/init.erb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ start() {
start
fi
else
/sbin/runuser $KAFKA_USER -c "KAFKA_JMX_OPTS=\"$KAFKA_JMX_OPTS\" $DAEMON $DAEMON_OPTS > /var/log/kafka/server.out 2> /var/log/kafka/server.err &"
/bin/su $KAFKA_USER -c "KAFKA_JMX_OPTS=\"$KAFKA_JMX_OPTS\" $DAEMON $DAEMON_OPTS > /var/log/kafka/server.out 2> /var/log/kafka/server.err &"
sleep 2
PID=`ps ax | grep -E '[k]afka.Kafka' | awk '{print $1}'`
echo $PID > $PID_FILE;
Expand Down

0 comments on commit cb8f86b

Please sign in to comment.