Skip to content

Commit

Permalink
Avoid Tower in notifications for embedded ansible
Browse files Browse the repository at this point in the history
ManageIQ should not indicate that anything "Tower" exists when dealing
with Embedded Ansible.  This should change the logs and notifications to
use a more "embedded ansibly" term when talking about embedded ansibly
things.

Before:

  "The operation Ansible Tower Credential creation (name=...) on Tower
                 ^^^^^^^^^^^^^
  (manager_id=...) completed successfully."

After:

  "The operation Ansible Automation Inside Credential creation (name=...)
                 ^^^^^^^^^^^^^^^^^^^^^^^^^
  on EMS(manager_id=1) completed successfully."

https://bugzilla.redhat.com/show_bug.cgi?id=1458593
  • Loading branch information
blomquisg committed Jun 29, 2017
1 parent ed6f7be commit f664b19
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 f664b19

Please sign in to comment.