Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: locp/cassandra
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.14.0
Choose a base ref
...
head repository: locp/cassandra
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.14.1
Choose a head ref

Commits on Feb 20, 2016

  1. Copy the full SHA
    edff289 View commit details
  2. Copy the full SHA
    e4d4185 View commit details
  3. Copy the full SHA
    7a0d644 View commit details
  4. Copy the full SHA
    46bf34d View commit details
  5. Copy the full SHA
    27e8fd6 View commit details
  6. Copy the full SHA
    241e84e View commit details
  7. Add git identification.

    dallinb committed Feb 20, 2016
    Copy the full SHA
    1d763a2 View commit details
  8. Copy the full SHA
    267b687 View commit details
  9. Copy the full SHA
    f4e768b View commit details
  10. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    12a3212 View commit details
  11. Copy the full SHA
    b6f9f66 View commit details
  12. Copy the full SHA
    df94603 View commit details
  13. Copy the full SHA
    6fbe381 View commit details
  14. Copy the full SHA
    352461d View commit details
  15. Copy the full SHA
    18c11e3 View commit details
  16. Copy the full SHA
    94761ed View commit details
  17. Copy the full SHA
    2786a88 View commit details
  18. Copy the full SHA
    428db0d View commit details
  19. Copy the full SHA
    85d7630 View commit details
  20. Copy the full SHA
    8cdcf27 View commit details
  21. Copy the full SHA
    a80f8f6 View commit details
  22. Copy the full SHA
    7e0978c View commit details
  23. Copy the full SHA
    e867125 View commit details
  24. Copy the full SHA
    eb72cc3 View commit details
  25. Copy the full SHA
    4002107 View commit details
  26. Copy the full SHA
    b5e5e2a View commit details

Commits on Feb 21, 2016

  1. Copy the full SHA
    ec5f2d6 View commit details
  2. Copy the full SHA
    58f5878 View commit details
  3. Copy the full SHA
    1c1ae94 View commit details
  4. Copy the full SHA
    8a6e0f4 View commit details
  5. Copy the full SHA
    0e954c6 View commit details

Commits on Feb 22, 2016

  1. Copy the full SHA
    0a15673 View commit details
  2. Copy the full SHA
    4207bee View commit details
  3. Copy the full SHA
    8b06381 View commit details
  4. Copy the full SHA
    d681ae1 View commit details
  5. Copy the full SHA
    5d7ad24 View commit details
  6. Copy the full SHA
    5c760da View commit details

Commits on Feb 23, 2016

  1. Copy the full SHA
    c93cb68 View commit details
  2. Copy the full SHA
    2d271d3 View commit details
  3. Copy the full SHA
    0edd2e2 View commit details
  4. Copy the full SHA
    eb3cd0b View commit details
  5. Copy the full SHA
    9266e56 View commit details
  6. Copy the full SHA
    b11859a View commit details
  7. Copy the full SHA
    7f35e8a View commit details
  8. Copy the full SHA
    27f170b View commit details
  9. Copy the full SHA
    2d3e2c5 View commit details
  10. Copy the full SHA
    44e3854 View commit details
  11. Copy the full SHA
    800920e View commit details
  12. Fixed typo (voxpupuli#174).

    dallinb committed Feb 23, 2016
    Copy the full SHA
    26849b0 View commit details
  13. Copy the full SHA
    ba4cc55 View commit details
Showing with 3,404 additions and 2,745 deletions.
  1. +8 −0 .rubocop.yml
  2. +26 −25 .travis.yml
  3. +1 −1 .travis/acceptance.sh
  4. +1 −1 .travis/payload.sh
  5. +27 −0 CHANGELOG.md
  6. +26 −17 Gemfile
  7. +8 −3 Rakefile
  8. +0 −52 circle.bash
  9. +58 −11 circle.yml
  10. +7 −1 manifests/datastax_agent.pp
  11. +7 −1 manifests/init.pp
  12. +12 −0 manifests/params.pp
  13. +1 −1 metadata.json
  14. +157 −0 scripts/circle.bash
  15. +16 −0 scripts/module_version.py
  16. +78 −86 spec/acceptance/cassandra_spec.rb
  17. +14 −0 spec/acceptance/nodesets/aws_centos6.yml
  18. +0 −10 spec/acceptance/nodesets/{centos.yml → aws_centos7.yml}
  19. +0 −10 spec/acceptance/nodesets/{ubuntu.yml → aws_ubuntu12.yml}
  20. 0 spec/acceptance/nodesets/{debian.yml → circle_debian7.yml}
  21. +14 −0 spec/acceptance/nodesets/circle_ubuntu14.yml
  22. +66 −63 spec/classes/cassandra_debian_spec.rb
  23. +7 −0 spec/classes/cassandra_params_spec.rb
  24. +68 −56 spec/classes/cassandra_redhat_spec.rb
  25. +136 −114 spec/classes/cassandra_spec.rb
  26. +904 −262 spec/classes/cassandra_template2_spec.rb
  27. +56 −40 spec/classes/datastax_agent_spec.rb
  28. +29 −27 spec/classes/datastax_repo_spec.rb
  29. +37 −35 spec/classes/firewall_ports_spec.rb
  30. +19 −24 spec/classes/java_spec.rb
  31. +22 −13 spec/classes/opscenter/pycyrpto_spec.rb
  32. +284 −287 spec/classes/opscenter_spec.rb
  33. +14 −15 spec/classes/optutils_spec.rb
  34. +20 −19 spec/defines/opscenter/cluster_config_purge_spec.rb
  35. +115 −155 spec/defines/opscenter/cluster_name_spec.rb
  36. +13 −17 spec/defines/private/firewall_ports/rule_spec.rb
  37. +1,144 −1,394 spec/defines/private/opscenter/setting_spec.rb
  38. +9 −5 spec/spec_helper_acceptance.rb
8 changes: 8 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
AllCops:
Exclude:
- 'spec/classes/datastax_agent_spec.rb'
- 'spec/classes/opscenter_spec.rb'
- 'spec/defines/opscenter/cluster_name_spec.rb'
- 'spec/defines/private/opscenter/setting_spec.rb'
- 'vendor/**/*'
51 changes: 26 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
---
---
before_install:
- "openssl aes-256-cbc -K $encrypted_aa8913b81047_key -iv $encrypted_aa8913b81047_iv -in .travis/secrets.tar.enc -out secrets.tar -d"
bundler_args: "--without development"
language: ruby
bundler_args: --without development
before_install:
- openssl aes-256-cbc -K $encrypted_aa8913b81047_key -iv $encrypted_aa8913b81047_iv
-in .travis/secrets.tar.enc -out secrets.tar -d
script:
- bundle exec rake lint
- bundle exec rake validate
- bundle exec rake spec SPEC_OPTS='--format documentation'
- sh .travis/acceptance.sh
notifications:
matrix:
fast_finish: true
include:
-
env: PUPPET_GEM_VERSION="3.8.4"
rvm: "1.9.3"
-
env: PUPPET_GEM_VERSION="3.8.4"
rvm: "2.1.5"
-
env: "PUPPET_GEM_VERSION=\"~> 4.0\" STRICT_VARIABLES=\"yes\""
rvm: "2.1.6"
notifications:
email: false
webhooks:
urls:
- https://webhooks.gitter.im/e/3477acef6dd93b015c9b
on_success: change
webhooks:
on_failure: always
on_success: change
urls:
- "https://webhooks.gitter.im/e/3477acef6dd93b015c9b"
script:
- "bundle exec rake lint"
- "bundle exec rake validate"
- "bundle exec rake spec SPEC_OPTS='--format documentation'"
- "sh .travis/acceptance.sh"
sudo: false
matrix:
fast_finish: true
include:
- rvm: 1.9.3
#env: PUPPET_GEM_VERSION="~> 3.0"
env: PUPPET_GEM_VERSION="3.8.4"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="3.8.4"
- rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
2 changes: 1 addition & 1 deletion .travis/acceptance.sh
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ echo "TRAVIS_TEST_RESULT : $TRAVIS_TEST_RESULT"
# Check if we are to run this at all.
#############################################################################

echo "$TRAVIS_BRANCH" | grep -q "^release/"
echo "$TRAVIS_BRANCH" | grep -Eq '^release/[0-9]{1,4}/v[0-9]'

if [ $? != 0 ]; then
echo "Not on a release branch, skipping acceptance tests."
2 changes: 1 addition & 1 deletion .travis/payload.sh
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ gem install --no-rdoc bundler rake
bundle install --without development
status=0

for node in $( bundle exec rake beaker_nodes ); do
for node in $( bundle exec rake beaker_nodes | grep '^aws_' ); do
BEAKER_set=$node bundle exec rake beaker

if [ $? != 0 ]; then
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,32 @@
# Change Log for Puppet Module locp-cassandra

##20016-02-27 - Release 1.14.1 ([diff](https://github.com/locp/cassandra/compare/1.14.0...1.14.1))

### Summary

A non-functional release of improvements and a bugfix.

### Features

* N/A

### Bugfixes

* If a systemd service file is created or updated, then systemctl daemon-reload
is now be executed.

### Improvements

* The workflow for building the module has been improved to include:
* Automatic integration of improvements and bugfixes into release candidates.
* Testing of release candidates includes acceptance (beaker) as well as
unit (spec) tests.
* The refactoring of the majority of the Ruby code used to test and
build this module so that it is hopefully more readable and easier to
maintain.
* The automation of what had previously been manual steps when building a
release.

##2016-02-19 - Release 1.14.0 ([diff](https://github.com/locp/cassandra/compare/1.13.0...1.14.0))

### Summary
43 changes: 26 additions & 17 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,25 +1,34 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org"
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

puppetversion = ENV['PUPPET_GEM_VERSION']

if puppetversion
gem 'puppet', puppetversion, require: false
else
gem 'puppet', require: false
end

puppetversion = ENV.key?('PUPPET_GEM_VERSION') ? " #{ENV['PUPPET_GEM_VERSION']}" : ['>= 4.0']
gem 'puppet', puppetversion
gem 'facter', '>= 1.7.0'

group :system_tests do
gem 'coveralls', :require => false
gem 'docker-api', :require => false
gem 'beaker-rspec', :require => false
gem 'backports', '3.6.8'
gem 'beaker', '2.33.0'
gem 'fog', :require => false
gem 'beaker-rspec', require: false
gem 'coveralls', require: false
gem 'docker-api', require: false
gem 'fog', require: false
gem 'fog-google', '<= 0.0.9'
gem 'pry', :require => false
gem 'puppet-blacksmith', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'hiera', require: false
gem 'metadata-json-lint', require: false
gem 'pry', require: false
gem 'puppet-blacksmith', require: false
gem 'puppet-lint', require: false
gem 'puppetlabs_spec_helper', require: false
gem 'rspec_junit_formatter', '0.2.2'
gem 'rspec-puppet', :require => false
gem 'rspec-puppet-utils', :require => false
gem 'serverspec', :require => false
gem 'metadata-json-lint', :require => false
gem 'puppet-lint', :require => false
gem 'travis', :require => false
gem 'travis-lint', :require => false
gem 'rspec-puppet', require: false
gem 'rspec-puppet-utils', require: false
gem 'rubocop', require: false
gem 'serverspec', require: false
gem 'travis', require: false
gem 'travis-lint', require: false
end
11 changes: 8 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
require 'rubygems'
require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet_blacksmith/rake_tasks'
require 'puppetlabs_spec_helper/rake_tasks'
require 'rubocop/rake_task'
require 'rubygems'

# Use a custom pattern with git tag. %s is replaced with the version number.
Blacksmith::RakeTask.new do |t|
t.tag_pattern = "%s" # Use a custom pattern with git tag. %s is replaced with the version number.
t.tag_pattern = '%s'
end

RuboCop::RakeTask.new
52 changes: 0 additions & 52 deletions circle.bash

This file was deleted.

69 changes: 58 additions & 11 deletions circle.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,59 @@
---
# CircleCI configuration file (circle.yml).
test:
override:
- ./circle.bash unit_tests:
---
machine:
services:
- docker
dependencies:
cache_directories:
- ../.rvm/rubies
override:
- |
case $CIRCLE_NODE_INDEX in
0) export RVM=1.9.3-p448
rvm use ruby-${RVM}
PUPPET_GEM_VERSION="~> 3.0" rvm-exec $RVM bash -c "bundle check --path=vendor/bundle || bundle install --path=vendor/bundle"
;;
1) export RVM=2.1.5
rvm use ruby-${RVM}
PUPPET_GEM_VERSION="~> 3.0" rvm-exec $RVM bash -c "bundle check --path=vendor/bundle || bundle install --path=vendor/bundle"
;;
2) export RVM=2.1.6
rvm use ruby-${RVM}
PUPPET_GEM_VERSION="~> 4.0" rvm-exec $RVM bash -c "bundle check --path=vendor/bundle || bundle install --path=vendor/bundle"
;;
3) bundle install --without development
;;
esac
deployment:
bugfix:
branch: /^bugfix.*/
commands:
- "./scripts/circle.bash merge release/patch"
improvement:
branch: /^improvement.*/
commands:
- "./scripts/circle.bash merge release/patch"
master:
branch: master
commands:
- "./scripts/circle.bash merge release/latest"
- "./scripts/circle.bash deploy"
patch_release:
branch: release/patch
commands:
- "./scripts/circle.bash merge release/minor"
notify:
webhooks:
-
url: "https://webhooks.gitter.im/e/da8c065419a91983f0cf"
test:
override:
-
? "case $CIRCLE_NODE_INDEX in 0) RVM=1.9.3-p551 rvm-exec 1.9.3-p551 ./scripts/circle.bash unit_tests ;; 1) RVM=2.1.5 rvm-exec 2.1.5 ./scripts/circle.bash unit_tests ;; 2) RVM=2.1.6 rvm-exec 2.1.6 ./scripts/circle.bash unit_tests ;; 3) bundle exec rake rubocop ;; esac"
:
parallel: true
- ./scripts/circle.bash acceptance_tests circle_debian7:
timeout: 300
parallel: true
- ./scripts/circle.bash acceptance_tests circle_ubuntu14:
timeout: 300
parallel: true

notify:
webhooks:
# A list of hook hashes, containing the url field
# gitter hook
- url: https://webhooks.gitter.im/e/da8c065419a91983f0cf
8 changes: 7 additions & 1 deletion manifests/datastax_agent.pp
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
$agent_alias = undef,
$async_pool_size = undef,
$async_queue_size = undef,
){
) inherits ::cassandra::params {
package { $package_name:
ensure => $package_ensure,
require => Class['cassandra'],
@@ -131,13 +131,19 @@
before => Package[$package_name],
}

exec { 'datastax_agent_reload_systemctl':
command => "${::cassandra::params::systemctl} daemon-reload",
refreshonly => true
}

file { "${systemd_path}/${service_name}.service":
ensure => present,
owner => 'root',
group => 'root',
content => template('cassandra/datastax-agent.service.erb'),
mode => '0644',
before => Package[$package_name],
notify => Exec['datastax_agent_reload_systemctl']
}
}

8 changes: 7 additions & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
@@ -161,7 +161,7 @@
$trickle_fsync_interval_in_kb = 10240,
$truncate_request_timeout_in_ms = 60000,
$write_request_timeout_in_ms = 2000
) {
) inherits cassandra::params {
if $manage_dsc_repo == true {
$dep_014_url = 'https://github.com/locp/cassandra/wiki/DEP-014'
require '::cassandra::datastax_repo'
@@ -239,13 +239,19 @@
}

if $service_systemd == true {
exec { 'cassandra_reload_systemctl':
command => "${::cassandra::params::systemctl} daemon-reload",
refreshonly => true
}

file { "${systemd_path}/${service_name}.service":
ensure => present,
owner => 'root',
group => 'root',
content => template('cassandra/cassandra.service.erb'),
mode => '0644',
before => Package[$cassandra_pkg],
notify => Exec[cassandra_reload_systemctl]
}
}

12 changes: 12 additions & 0 deletions manifests/params.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# == Class cassandra::params
#
# This class is meant to be called from cassandra
# It sets variables according to platform
#
class cassandra::params {
if $::osfamily == 'Debian' {
$systemctl = '/bin/systemctl'
} elsif $::osfamily == 'RedHat' {
$systemctl = '/usr/bin/systemctl'
}
}
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "locp-cassandra",
"version": "1.14.0",
"version": "1.14.1",
"author": "locp",
"summary": "Installs Cassandra, DataStax Agent & OpsCenter on RHEL/Ubuntu/Debian.",
"license": "Apache-2.0",
Loading