mirror of
https://github.com/ZwareBear/awx.git
synced 2026-05-13 06:58:37 -05:00
Beginning work on GCE.
This commit is contained in:
@@ -27,11 +27,12 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique):
|
||||
'''
|
||||
|
||||
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')),
|
||||
('gce', _('Google Compute Engine')),
|
||||
]
|
||||
|
||||
PASSWORD_FIELDS = ('password', 'ssh_key_data', 'ssh_key_unlock',
|
||||
|
||||
+4
-1
@@ -869,6 +869,9 @@ class RunInventoryUpdate(BaseTask):
|
||||
env['VMWARE_HOST'] = passwords.get('source_host', '')
|
||||
env['VMWARE_USER'] = passwords.get('source_username', '')
|
||||
env['VMWARE_PASSWORD'] = passwords.get('source_password', '')
|
||||
elif inventory_update.source == 'gce':
|
||||
pass
|
||||
# env['GCE_USER']
|
||||
|
||||
elif inventory_update.source == 'file':
|
||||
# FIXME: Parse source_env to dict, update env.
|
||||
@@ -902,7 +905,7 @@ class RunInventoryUpdate(BaseTask):
|
||||
# These settings are "per-cloud-provider"; it's entirely possible that
|
||||
# they will be different between cloud providers if a Tower user
|
||||
# actively uses more than one.
|
||||
if inventory_update.source in ('ec2', 'rax', 'vmware'):
|
||||
if inventory_update.source in ('ec2', 'rax', 'vmware', 'gce'):
|
||||
# We need to reference the source's code frequently, assign it
|
||||
# to a shorter variable. :)
|
||||
src = inventory_update.source
|
||||
|
||||
Reference in New Issue
Block a user