Start requiring Ansible 2.4

4 files changed, 25 insertions, 8 deletions

diff --git a/.pylintrc b/.pylintrc
index e85987de3..80c74b734 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -214,7 +214,8 @@ ignore-mixin-members=yes
 # (useful for modules/projects where namespaces are manipulated during runtime
 # and thus existing member attributes cannot be deduced by static analysis. It
 # supports qualified module names, as well as Unix pattern matching.
-ignored-modules=
+# Ignoring ansible.constants to suppress `no-member` warnings
+ignored-modules=ansible.constants
 
 # List of classes names for which member attributes should not be checked
 # (useful for classes with attributes dynamically set). This supports can work
diff --git a/callback_plugins/aa_version_requirement.py b/callback_plugins/aa_version_requirement.py
index 9562adb28..110b3d673 100644
--- a/callback_plugins/aa_version_requirement.py
+++ b/callback_plugins/aa_version_requirement.py
@@ -29,7 +29,7 @@ else:
 
 
 # Set to minimum required Ansible version
-REQUIRED_VERSION = '2.3.0.0'
+REQUIRED_VERSION = '2.4.0.0'
 DESCRIPTION = "Supported versions: %s or newer" % REQUIRED_VERSION
 
 
diff --git a/requirements.txt b/requirements.txt
index bf95b4ff9..5bc29f193 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 # Versions are pinned to prevent pypi releases arbitrarily breaking
 # tests with new APIs/semantics. We want to update versions deliberately.
-ansible==2.3.1.0
+ansible==2.4.0.0
 boto==2.34.0
 click==6.7
 pyOpenSSL==16.2.0
diff --git a/setup.py b/setup.py
index 3b786e0fb..5bf48b5ad 100644
--- a/setup.py
+++ b/setup.py
@@ -83,10 +83,14 @@ def find_entrypoint_playbooks():
                 if not isinstance(task, dict):
                     # Skip yaml files which are not a dictionary of tasks
                     continue
-                if 'include' in task:
+                if 'include' in task or 'import_playbook' in task:
                     # Add the playbook and capture included playbooks
                     playbooks.add(yaml_file)
-                    included_file_name = task['include'].split()[0]
+                    if 'include' in task:
+                        directive = task['include']
+                    else:
+                        directive = task['import_playbook']
+                    included_file_name = directive.split()[0]
                     included_file = os.path.normpath(
                         os.path.join(os.path.dirname(yaml_file),
                                      included_file_name))
@@ -318,7 +322,7 @@ class OpenShiftAnsibleSyntaxCheck(Command):
         has_errors = False
 
         print('Ansible Deprecation Checks')
-        exclude_dirs = ['adhoc', 'files', 'meta', 'test', 'tests', 'vars', 'defaults', '.tox']
+        exclude_dirs = ['adhoc', 'files', 'meta', 'vars', 'defaults', '.tox']
         for yaml_file in find_files(
                 os.getcwd(), exclude_dirs, None, r'\.ya?ml$'):
             with open(yaml_file, 'r') as contents:
@@ -336,7 +340,6 @@ class OpenShiftAnsibleSyntaxCheck(Command):
 
         if not has_errors:
             print('...PASSED')
-
         print('Ansible Playbook Entry Point Syntax Checks')
         for playbook in find_entrypoint_playbooks():
             print('-' * 60)
@@ -350,8 +353,21 @@ class OpenShiftAnsibleSyntaxCheck(Command):
             # --syntax-check each entry point playbook
             else:
                 try:
+                    # Create a host group list to avoid WARNING on unmatched host patterns
+                    host_group_list = [
+                        'etcd,masters,nodes,OSEv3',
+                        'oo_all_hosts',
+                        'oo_etcd_to_config,oo_new_etcd_to_config,oo_first_etcd,oo_etcd_hosts_to_backup,'
+                        'oo_etcd_hosts_to_upgrade,oo_etcd_to_migrate',
+                        'oo_masters,oo_masters_to_config,oo_first_master,oo_containerized_master_nodes',
+                        'oo_nodes_to_config,oo_nodes_to_upgrade',
+                        'oo_nodes_use_kuryr,oo_nodes_use_flannel',
+                        'oo_nodes_use_calico,oo_nodes_use_nuage,oo_nodes_use_contiv',
+                        'oo_lb_to_config',
+                        'oo_nfs_to_config',
+                        'glusterfs,glusterfs_registry,']
                     subprocess.check_output(
-                        ['ansible-playbook', '-i localhost,',
+                        ['ansible-playbook', '-i ' + ','.join(host_group_list),
                          '--syntax-check', playbook]
                     )
                 except subprocess.CalledProcessError as cpe: