From 864f8b325e2321f2f0fd9c29de189d5049c5c3f8 Mon Sep 17 00:00:00 2001 From: Adam Grare Date: Thu, 29 Jun 2017 15:35:30 -0400 Subject: [PATCH] Merge pull request #15478 from blomquisg/tower_not_tower Avoid Tower in notifications for embedded ansible (cherry picked from commit 2b6dd956c78620a609247ddfe7cfb13ee1108e35) https://bugzilla.redhat.com/show_bug.cgi?id=1478429 --- .../embedded_ansible/automation_manager/configuration_script.rb | 2 ++ .../automation_manager/configuration_script_source.rb | 2 ++ .../providers/embedded_ansible/automation_manager/credential.rb | 2 ++ 3 files changed, 6 insertions(+) diff --git a/app/models/manageiq/providers/embedded_ansible/automation_manager/configuration_script.rb b/app/models/manageiq/providers/embedded_ansible/automation_manager/configuration_script.rb index 2c5baed4401..a835cfd2bfc 100644 --- a/app/models/manageiq/providers/embedded_ansible/automation_manager/configuration_script.rb +++ b/app/models/manageiq/providers/embedded_ansible/automation_manager/configuration_script.rb @@ -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 diff --git a/app/models/manageiq/providers/embedded_ansible/automation_manager/configuration_script_source.rb b/app/models/manageiq/providers/embedded_ansible/automation_manager/configuration_script_source.rb index 282933bd176..19fadab5b3a 100644 --- a/app/models/manageiq/providers/embedded_ansible/automation_manager/configuration_script_source.rb +++ b/app/models/manageiq/providers/embedded_ansible/automation_manager/configuration_script_source.rb @@ -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 diff --git a/app/models/manageiq/providers/embedded_ansible/automation_manager/credential.rb b/app/models/manageiq/providers/embedded_ansible/automation_manager/credential.rb index 38184f54ae6..90c670be3b1 100644 --- a/app/models/manageiq/providers/embedded_ansible/automation_manager/credential.rb +++ b/app/models/manageiq/providers/embedded_ansible/automation_manager/credential.rb @@ -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