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
  • Loading branch information
agrare authored Jun 29, 2017
2 parents ce47a5f + f664b19 commit 2b6dd95
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 @@ -3,4 +3,6 @@ class ManageIQ::Providers::EmbeddedAnsible::AutomationManager::ConfigurationScri

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

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 2b6dd95

Please sign in to comment.