Merge pull request #1411 from wwitzel3/more-rht-integration

RedHat Inventory Integrations

awx/main/constants.py

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Ansible, Inc.
 # All Rights Reserved.
 
-CLOUD_PROVIDERS = ('azure', 'ec2', 'gce', 'rax', 'vmware', 'openstack')
+CLOUD_PROVIDERS = ('azure', 'ec2', 'gce', 'rax', 'vmware', 'openstack', 'foreman', 'cloudforms')
 SCHEDULEABLE_PROVIDERS = CLOUD_PROVIDERS + ('custom',)

awx/main/models/base.py

@@ -61,7 +61,7 @@ PERMISSION_TYPE_CHOICES = [
     (PERM_JOBTEMPLATE_CREATE, _('Create a Job Template')),
 ]
 
-CLOUD_INVENTORY_SOURCES = ['ec2', 'rax', 'vmware', 'gce', 'azure', 'openstack', 'custom']
+CLOUD_INVENTORY_SOURCES = ['ec2', 'rax', 'vmware', 'gce', 'azure', 'openstack', 'custom', 'foreman', 'cloudforms']
 
 VERBOSITY_CHOICES = [
     (0, '0 (Normal)'),

awx/main/models/credential.py

@@ -32,21 +32,23 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique, ResourceMixin):
     '''
 
     KIND_CHOICES = [
-        ('ssh',    _('Machine')),
-        ('scm',    _('Source Control')),
-        ('aws',    _('Amazon Web Services')),
-        ('rax',    _('Rackspace')),
+        ('ssh', _('Machine')),
+        ('scm', _('Source Control')),
+        ('aws', _('Amazon Web Services')),
+        ('rax', _('Rackspace')),
         ('vmware', _('VMware vCenter')),
-        ('gce',    _('Google Compute Engine')),
-        ('azure',  _('Microsoft Azure')),
+        ('foreman', _('Satellite 6')),
+        ('cloudforms', _('CloudForms')),
+        ('gce', _('Google Compute Engine')),
+        ('azure', _('Microsoft Azure')),
         ('openstack', _('OpenStack')),
     ]
 
     BECOME_METHOD_CHOICES = [
-        ('',       _('None')),
-        ('sudo',   _('Sudo')),
-        ('su',     _('Su')),
-        ('pbrun',  _('Pbrun')),
+        ('', _('None')),
+        ('sudo', _('Sudo')),
+        ('su', _('Su')),
+        ('pbrun', _('Pbrun')),
         ('pfexec', _('Pfexec')),
         #('runas',  _('Runas')),
     ]

awx/main/models/inventory.py

@@ -725,13 +725,15 @@ class InventorySourceOptions(BaseModel):
     '''
 
     SOURCE_CHOICES = [
-        ('',       _('Manual')),
-        ('file',   _('Local File, Directory or Script')),
-        ('rax',    _('Rackspace Cloud Servers')),
-        ('ec2',    _('Amazon EC2')),
-        ('gce',    _('Google Compute Engine')),
-        ('azure',  _('Microsoft Azure')),
+        ('', _('Manual')),
+        ('file', _('Local File, Directory or Script')),
+        ('rax', _('Rackspace Cloud Servers')),
+        ('ec2', _('Amazon EC2')),
+        ('gce', _('Google Compute Engine')),
+        ('azure', _('Microsoft Azure')),
         ('vmware', _('VMware vCenter')),
+        ('foreman', _('Satellite 6')),
+        ('cloudforms', _('CloudForms')),
         ('openstack', _('OpenStack')),
         ('custom', _('Custom Script')),
     ]

awx/main/tasks.py

@@ -1223,6 +1223,38 @@ class RunInventoryUpdate(BaseTask):
             for k,v in vmware_opts.items():
                 cp.set(section, k, unicode(v))
 
+        elif inventory_update.source == 'foreman':
+            section = 'foreman'
+            cp.add_section(section)
+
+            foreman_opts = dict(inventory_update.source_vars_dict.items())
+            foreman_opts.setdefault('ssl_verify', 'False')
+            for k, v in foreman_opts.items():
+                cp.set(section, k, unicode(v))
+
+            credential = inventory_update.credential
+            if credential:
+                cp.set(section, 'url', credential.host)
+                cp.set(section, 'user', credential.username)
+                cp.set(section, 'password', decrypt_field(credential, 'password'))
+
+            section = 'ansible'
+            cp.set(section, 'group_patterns', '["{app}-{tier}-{color}", "{app}-{color}", "{app}", "{tier}"]')
+
+            section = 'cache'
+            cp.set(section, 'path', '/tmp')
+            cp.set(section, 'max_age', '0')
+
+        elif inventory_update.source == 'cloudforms':
+            section = 'cloudforms'
+            cp.add_section(section)
+
+            credential = inventory_update.credential
+            if credential:
+                cp.set(section, 'hostname', credential.host)
+                cp.set(section, 'username', credential.username)
+                cp.set(section, 'password', decrypt_field(credential, 'password'))
+
         # Return INI content.
         if cp.sections():
             f = cStringIO.StringIO()
@@ -1305,6 +1337,10 @@ class RunInventoryUpdate(BaseTask):
             env['GCE_ZONE'] = inventory_update.source_regions
         elif inventory_update.source == 'openstack':
             env['OS_CLIENT_CONFIG_FILE'] = cloud_credential
+        elif inventory_update.source == 'foreman':
+            env['FOREMAN_INI_PATH'] = cloud_credential
+        elif inventory_update.source == 'cloudforms':
+            env['CLOUDFORMS_INI_PATH'] = cloud_credential
         elif inventory_update.source == 'file':
             # FIXME: Parse source_env to dict, update env.
             pass