Skip to content
This repository has been archived by the owner on Jan 29, 2022. It is now read-only.

Commit

Permalink
Only load mco and chatops plugins if enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
dhollinger committed Nov 2, 2018
1 parent a9fd154 commit 27269ef
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
5 changes: 2 additions & 3 deletions lib/helpers/deployments.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
require 'plugins/mcollective'
require 'plugins/chatops'

module Deployments # rubocop:disable Style/Documentation
def deploy(branch, deleted)
# Currently requires puppet_webhook to be run as a non-root
# user with access to running the MCollective client.
if settings.use_mcollective
require 'plugins/mcollective'
results = PuppetWebhook::Mcollective.new('r10k',
'deploy',
{
Expand Down Expand Up @@ -43,6 +41,7 @@ def deploy_module(module_name)
# Currently requires puppet_webhook to be run as a non-root
# user with access to running the MCollective client.
if settings.use_mcollective
require 'plugins/mcollective'
results = PuppetWebhook::Mcollective.new('r10k',
'deploy',
{
Expand Down
2 changes: 2 additions & 0 deletions lib/helpers/tasks.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ def generate_types(environment)
def notification(message)
return unless settings.chatops || settings.slack_webhook

require 'plugins/chatops'

slack_settings if settings.chatops == false && settings.slack_webhook != false
PuppetWebhook::Chatops.new(settings.chatops_service,
settings.chatops_url,
Expand Down
1 change: 1 addition & 0 deletions spec/unit/plugins/webhook_chatops_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require 'spec_helper'
require 'plugins/chatops'

describe PuppetWebhook::Chatops do
describe '#notify' do
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/plugins/webhook_mcollective_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require 'spec_helper'
require 'mcollective'
require 'plugins/mcollective'

describe PuppetWebhook::Mcollective do
describe '#initialize' do
Expand Down

0 comments on commit 27269ef

Please sign in to comment.