Skip to content

Commit

Permalink
Merge pull request #15478 from blomquisg/tower_not_tower
Browse files Browse the repository at this point in the history
Avoid Tower in notifications for embedded ansible
(cherry picked from commit 2b6dd95)

https://bugzilla.redhat.com/show_bug.cgi?id=1478429
  • Loading branch information
agrare authored and simaishi committed Aug 4, 2017
1 parent 033cce4 commit 864f8b3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::ConfigurationScri
ManageIQ::Providers::EmbeddedAutomationManager::ConfigurationScript

include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::ConfigurationScript

FRIENDLY_NAME = "Ansible Automation Inside Job Template".freeze
end
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::ConfigurationScri

include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::ConfigurationScriptSource
include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::TowerApi

FRIENDLY_NAME = "Ansible Automation Inside Project".freeze
end
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::Credential < Mana
include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::Credential
include ManageIQ::Providers::AnsibleTower::Shared::AutomationManager::TowerApi

FRIENDLY_NAME = "Ansible Automation Inside Credential".freeze

def self.provider_params(params)
super.merge(:organization => ManageIQ::Providers::EmbeddedAnsible::AutomationManager.first.provider.default_organization)
end
Expand Down

0 comments on commit 864f8b3

Please sign in to comment.