Merge pull request #286 from sensu/revert-284-master

Revert "Flapjack support for puppet"
sensu · Dec 14, 2014 · c2dfa6e · c2dfa6e
2 parents 940a419 + 362e656
commit c2dfa6e
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 219 deletions.
diff --git a/lib/puppet/provider/sensu_flapjack_config/json.rb b/lib/puppet/provider/sensu_flapjack_config/json.rb
diff --git a/lib/puppet/type/sensu_flapjack_config.rb b/lib/puppet/type/sensu_flapjack_config.rb
diff --git a/manifests/flapjack/config.pp b/manifests/flapjack/config.pp
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -209,9 +209,6 @@
   $rabbitmq_ssl_cert_chain  = undef,
   $redis_host               = 'localhost',
   $redis_port               = 6379,
-  $flapjack_redis_host      = 'localhost',
-  $flapjack_redis_port      = 6380,
-  $flapjack_redis_db        = 0,
   $api_bind                 = '0.0.0.0',
   $api_host                 = 'localhost',
   $api_port                 = 4567,
@@ -280,7 +277,6 @@
   class { 'sensu::rabbitmq::config': } ->
   class { 'sensu::api::config': } ->
   class { 'sensu::redis::config': } ->
-  class { 'sensu::flapjack::config': } ->
   class { 'sensu::client::config': } ->
   class { 'sensu::client::service': } ->
   class { 'sensu::api::service': } ->

diff --git a/manifests/server/service.pp b/manifests/server/service.pp
@@ -25,7 +25,7 @@
       ensure     => $ensure,
       enable     => $enable,
       hasrestart => true,
-      subscribe  => [ Class['sensu::package'], Class['sensu::api::config'], Class['sensu::redis::config'], Class['sensu::rabbitmq::config'], Class['sensu::flapjack::config'] ],
+      subscribe  => [ Class['sensu::package'], Class['sensu::api::config'], Class['sensu::redis::config'], Class['sensu::rabbitmq::config'] ],
     }
   }
 }
diff --git a/spec/classes/sensu_flapjack_spec.rb b/spec/classes/sensu_flapjack_spec.rb