cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Port cs_facts to the ansible 2.4 facts API (#27257)

Browse source 
* Port cs_facts to the ansible 2.4 facts API

Fixes #27256
References #27254
This commit is contained in:
Toshio Kuratomi 2017-07-25 12:08:54 -07:00 committed by GitHub
parent 197a360977
commit 0d290bddda
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/modules/cloud/cloudstack/cs_facts.py
View file

@ -106,7 +106,7 @@ cloudstack_user_data:
import os import os
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.urls import fetch_url from ansible.module_utils.urls import fetch_url
from ansible.module_utils.facts import ansible_facts, module from ansible.module_utils.facts import ansible_collector, default_collectors
try: try:
import yaml import yaml
@ -121,7 +121,12 @@ CS_USERDATA_BASE_URL = "http://%s/latest/user-data"
class CloudStackFacts(object): class CloudStackFacts(object):
def __init__(self): def __init__(self):
self.facts = ansible_facts(module) collector = ansible_collector.get_ansible_collector(all_collector_classes=default_collectors.collectors,
filter_spec='default_ipv4',
gather_subset=['!all', 'network'],
gather_timeout=10)
self.facts = collector.collect(module)
self.api_ip = None self.api_ip = None
self.fact_paths = { self.fact_paths = {
'cloudstack_service_offering': 'service-offering', 'cloudstack_service_offering': 'service-offering',