Merge pull request #14199 from mzazrivec/fixes_for_embedded_ansible

Changes for Embedded Ansible models
ManageIQ · Mar 7, 2017 · ad4e7ee · ad4e7ee
2 parents e8129d5 + 5c3d9cd
commit ad4e7ee
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/locale/en.yml b/locale/en.yml
@@ -736,6 +736,19 @@ en:
       LdapServer:               LDAP Server
       LoadBalancer:             Load Balancer
       ManageIQ::Providers::BaseManager:                                     Provider
+      ManageIQ::Providers::EmbeddedAutomationManager::Authentication:                Credential
+      ManageIQ::Providers::EmbeddedAutomationManager::ConfigurationScriptSource:     Repository
+      ManageIQ::Providers::EmbeddedAnsible::AutomationManager::AmazonCredential:     Credential (Amazon)
+      ManageIQ::Providers::EmbeddedAnsible::AutomationManager::AzureCredential:      Credential (Microsoft Azure)
+      ManageIQ::Providers::EmbeddedAnsible::AutomationManager::GoogleCredential:     Credential (Google)
+      ManageIQ::Providers::EmbeddedAnsible::AutomationManager::MachineCredential:    Credential (Machine)
+      ManageIQ::Providers::EmbeddedAnsible::AutomationManager::NetworkCredential:    Credential (Network)
+      ManageIQ::Providers::EmbeddedAnsible::AutomationManager::OpenstackCredential:  Credential (OpenStack)
+      ManageIQ::Providers::EmbeddedAnsible::AutomationManager::RackspaceCredential:  Credential (Rackspace)
+      ManageIQ::Providers::EmbeddedAnsible::AutomationManager::Satellite6Credential: Credential (Satellite)
+      ManageIQ::Providers::EmbeddedAnsible::AutomationManager::ScmCredential:        Credential (SCM)
+      ManageIQ::Providers::EmbeddedAnsible::AutomationManager::VmwareCredential:     Credential (VMware)
+      ManageIQ::Providers::EmbeddedAnsible::AutomationManager::Playbook:             Playbook (Embedded Ansible)
       ManageIQ::Providers::AutomationManager::Authentication:                     Credential
       ManageIQ::Providers::AnsibleTower::AutomationManager::AmazonCredential:     Credential (Amazon)
       ManageIQ::Providers::AnsibleTower::AutomationManager::AzureCredential:      Credential (Microsoft Azure)

diff --git a/...ibleTower_AutomationManager_Playbook.yaml → ...edAnsible_AutomationManager_Playbook.yaml b/...ibleTower_AutomationManager_Playbook.yaml → ...edAnsible_AutomationManager_Playbook.yaml
@@ -15,7 +15,7 @@ title: Ansible Tower Playbooks
 name: Playbooks
 
 # Main DB table report is based on
-db: ManageIQ::Providers::AnsibleTower::AutomationManager::Playbook
+db: ManageIQ::Providers::EmbeddedAnsible::AutomationManager::Playbook
 
 # Columns to fetch from the main table
 cols:

diff --git a/...ers_AutomationManager_Authentication.yaml → ...ddedAutomationManager_Authentication.yaml b/...ers_AutomationManager_Authentication.yaml → ...ddedAutomationManager_Authentication.yaml
@@ -15,7 +15,7 @@ title: Credentials
 name: Credentials
 
 # Main DB table report is based on
-db: ManageIQ::Providers::AutomationManager::Authentication
+db: ManageIQ::Providers::EmbeddedAutomationManager::Authentication
 
 # Columns to fetch from the main table
 cols:

diff --git a/product/views/ConfigurationScriptSource.yaml → ...ionManager_ConfigurationScriptSource.yaml b/product/views/ConfigurationScriptSource.yaml → ...ionManager_ConfigurationScriptSource.yaml
@@ -15,7 +15,7 @@ title: Repository
 name: Repository
 
 # Main DB table report is based on
-db: ConfigurationScriptSource
+db: ManageIQ::Providers::EmbeddedAutomationManager::ConfigurationScriptSource
 
 # Columns to fetch from the main table
 cols: