External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-21 19:07:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

use fully qualified inventory plugin name

Browse Source
This commit is contained in:
AlanCoding
2019-10-09 14:02:30 -04:00
parent 08df2cad68
commit 16ebfe3a63
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -400,7 +400,7 @@ flake8_collection:
test_collection_all: prepare_collection_venv test_collection flake8_collection test_collection_all: prepare_collection_venv test_collection flake8_collection
build_collection: build_collection:
ansible-playbook -i localhost, awx_collection/template_galaxy.yml -e collection_package=$(COLLECTION_PACKAGE) -e namespace_name=$(COLLECTION_NAMESPACE) -e package_version=$(VERSION) ansible-playbook -i localhost, awx_collection/template_galaxy.yml -e collection_package=$(COLLECTION_PACKAGE) -e collection_namespace=$(COLLECTION_NAMESPACE) -e collection_version=$(VERSION)
ansible-galaxy collection build awx_collection --output-path=awx_collection ansible-galaxy collection build awx_collection --output-path=awx_collection
test_unit: test_unit:

4
awx_collection/plugins/inventory/tower.py
View File

@@ -77,7 +77,7 @@ EXAMPLES = '''
# Example for using tower_inventory.yml file # Example for using tower_inventory.yml file
plugin: tower plugin: awx.awx.tower
host: your_ansible_tower_server_network_address host: your_ansible_tower_server_network_address
username: your_ansible_tower_username username: your_ansible_tower_username
password: your_ansible_tower_password password: your_ansible_tower_password
@@ -116,7 +116,7 @@ except ImportError:
class InventoryModule(BaseInventoryPlugin): class InventoryModule(BaseInventoryPlugin):
NAME = 'tower' NAME = 'awx.awx.tower' # REPLACE
# Stays backward compatible with tower inventory script. # Stays backward compatible with tower inventory script.
# If the user supplies '@tower_inventory' as path, the plugin will read from environment variables. # If the user supplies '@tower_inventory' as path, the plugin will read from environment variables.
no_config_file_supplied = False no_config_file_supplied = False

6
awx_collection/template_galaxy.yml
View File

@@ -21,6 +21,12 @@
regexp: '^extends_documentation_fragment: awx.awx.auth$' regexp: '^extends_documentation_fragment: awx.awx.auth$'
replace: 'extends_documentation_fragment: {{ collection_namespace }}.{{ collection_package }}.auth' replace: 'extends_documentation_fragment: {{ collection_namespace }}.{{ collection_package }}.auth'
with_items: "{{ module_files.files }}" with_items: "{{ module_files.files }}"
- name: Change files to support desired namespace and package names
replace:
path: "{{ playbook_dir }}/plugins/inventory/tower.py"
regexp: "^ NAME = 'awx.awx.tower' # REPLACE$"
replace: " NAME = '{{ collection_namespace }}.{{ collection_package }}.tower' # REPLACE"
when: when:
- (collection_package != 'awx') or (collection_namespace != 'awx') - (collection_package != 'awx') or (collection_namespace != 'awx')