External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-13 20:37:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Pick up collections paths in openstack inventory update prep

Browse Source 
Update amazon.aws version

Update vmware to new release

Pin some more tests due to transitioning to inventory plugins

Remove more temporary hacks
This commit is contained in:
AlanCoding
2020-03-31 20:07:22 -04:00
parent 6b015c9d81
commit 47bdf86dfa
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/models/inventory.py
View File

@@ -2229,11 +2229,11 @@ class gce(PluginFileInjector):
class vmware(PluginFileInjector): class vmware(PluginFileInjector):
plugin_name = 'vmware_vm_inventory' # FIXME: implement me plugin_name = 'vmware_vm_inventory'
initial_version = '2.9' # Only tested with collection version initial_version = '2.9' # Only tested with collection version
ini_env_reference = 'VMWARE_INI_PATH' ini_env_reference = 'VMWARE_INI_PATH'
base_injector = 'managed' base_injector = 'managed'
namespace = 'alancoding' # FIXME namespace = 'community'
collection = 'vmware' collection = 'vmware'
@property @property
@@ -2544,7 +2544,10 @@ class openstack(PluginFileInjector):
return self.build_script_private_data(inventory_update, private_data_dir, mk_cache=False) return self.build_script_private_data(inventory_update, private_data_dir, mk_cache=False)
def get_plugin_env(self, inventory_update, private_data_dir, private_data_files): def get_plugin_env(self, inventory_update, private_data_dir, private_data_files):
return self.get_script_env(inventory_update, private_data_dir, private_data_files) env = super(openstack, self).get_plugin_env(inventory_update, private_data_dir, private_data_files)
script_env = self.get_script_env(inventory_update, private_data_dir, private_data_files)
env.update(script_env)
return env
def inventory_as_dict(self, inventory_update, private_data_dir): def inventory_as_dict(self, inventory_update, private_data_dir):
def use_host_name_for_name(a_bool_maybe): def use_host_name_for_name(a_bool_maybe):

15
awx/main/tests/unit/test_tasks.py
View File

@@ -1807,8 +1807,9 @@ class TestInventoryUpdateCredentials(TestJobExecution):
inventory_update.get_cloud_credential = mocker.Mock(return_value=None) inventory_update.get_cloud_credential = mocker.Mock(return_value=None)
inventory_update.get_extra_credentials = mocker.Mock(return_value=[]) inventory_update.get_extra_credentials = mocker.Mock(return_value=[])
private_data_files = task.build_private_data_files(inventory_update, private_data_dir) with mocker.patch('awx.main.tasks._get_ansible_version', mocker.MagicMock(return_value='2.7')):
env = task.build_env(inventory_update, private_data_dir, False, private_data_files) private_data_files = task.build_private_data_files(inventory_update, private_data_dir)
env = task.build_env(inventory_update, private_data_dir, False, private_data_files)
assert 'AWS_ACCESS_KEY_ID' not in env assert 'AWS_ACCESS_KEY_ID' not in env
assert 'AWS_SECRET_ACCESS_KEY' not in env assert 'AWS_SECRET_ACCESS_KEY' not in env
@@ -1915,8 +1916,9 @@ class TestInventoryUpdateCredentials(TestJobExecution):
inventory_update.get_cloud_credential = get_cred inventory_update.get_cloud_credential = get_cred
inventory_update.get_extra_credentials = mocker.Mock(return_value=[]) inventory_update.get_extra_credentials = mocker.Mock(return_value=[])
private_data_files = task.build_private_data_files(inventory_update, private_data_dir) with mocker.patch('awx.main.tasks._get_ansible_version', mocker.MagicMock(return_value='2.7')):
env = task.build_env(inventory_update, private_data_dir, False, private_data_files) private_data_files = task.build_private_data_files(inventory_update, private_data_dir)
env = task.build_env(inventory_update, private_data_dir, False, private_data_files)
safe_env = {} safe_env = {}
credentials = task.build_credentials_list(inventory_update) credentials = task.build_credentials_list(inventory_update)
@@ -2153,8 +2155,9 @@ class TestInventoryUpdateCredentials(TestJobExecution):
'satellite6_want_facts': False 'satellite6_want_facts': False
} }
private_data_files = task.build_private_data_files(inventory_update, private_data_dir) with mocker.patch('awx.main.tasks._get_ansible_version', mocker.MagicMock(return_value='2.7')):
env = task.build_env(inventory_update, private_data_dir, False, private_data_files) private_data_files = task.build_private_data_files(inventory_update, private_data_dir)
env = task.build_env(inventory_update, private_data_dir, False, private_data_files)
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read(env['FOREMAN_INI_PATH']) config.read(env['FOREMAN_INI_PATH'])

5
requirements/collections_requirements.yml
View File

@@ -5,13 +5,14 @@ collections:
- name: azure.azcollection - name: azure.azcollection
version: 0.1.1 # questionable https://github.com/ansible-collections/azure/issues/55 version: 0.1.1 # questionable https://github.com/ansible-collections/azure/issues/55
- name: amazon.aws - name: amazon.aws
version: 0.1.0 version: 0.1.1 # version 0.1.0 seems to have gone missing
- name: theforeman.foreman - name: theforeman.foreman
version: 0.7.0 # contains the inventory plugin, but more patches are needed version: 0.7.0 # contains the inventory plugin, but more patches are needed
- name: google.cloud - name: google.cloud
version: 0.0.9 # contains PR 167, should be good to go version: 0.0.9 # contains PR 167, should be good to go
- name: openstack.cloud - name: openstack.cloud
version: 0.0.1-dev85 # earlier had checksum mismatch version: 0.0.1-dev85 # earlier had checksum mismatch
- name: alancoding.vmware # FIXME needs patch https://github.com/ansible-collections/vmware/pull/58 - name: community.vmware
version: 0.3.1-dev1
- name: ovirt.ovirt_collection - name: ovirt.ovirt_collection
version: 1.0.1 # new fix published, should be good to go version: 1.0.1 # new fix published, should be good to go