Merge pull request #9109 from vrutkovs/ansible-2.6

Use ansible 2.6

.papr.sh

@@ -75,6 +75,7 @@ ansible-playbook -vvv -i $PAPR_INVENTORY $PAPR_EXTRAVARS playbooks/deploy_cluste
 if [[ "${PAPR_UPGRADE_FROM}" != "0" ]]; then
   git checkout new-code
   git clean -fdx
+  pip install -r requirements.txt
 fi
 
 # Run upgrade playbook

README.md

@@ -61,7 +61,7 @@ Install base dependencies:
 
 Requirements:
 
-- Ansible >= 2.4.3.0, 2.5.x is not currently supported for OCP installations
+- Ansible >= 2.6.0
 - Jinja >= 2.7
 - pyOpenSSL
 - python-lxml

openshift-ansible.spec

@@ -17,7 +17,7 @@ URL:            https://github.com/openshift/openshift-ansible
 Source0:        https://github.com/openshift/openshift-ansible/archive/%{commit}/%{name}-%{version}.tar.gz
 BuildArch:      noarch
 
-Requires:      ansible >= 2.4.3
+Requires:      ansible >= 2.6
 Requires:      python2
 Requires:      python-six
 Requires:      tar

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.4.3.0
+ansible==2.6.0.0
 boto==2.44.0
 click==6.7
 pyOpenSSL==17.5.0

roles/ansible_service_broker/tasks/migrate.yml

@@ -132,7 +132,9 @@
       register: migration_status
       ignore_errors: true
       until:
-        - "'results' in migration_status.results and migration_status.results.results | count > 0"
+        - "'results' in migration_status"
+        - "'results' in migration_status.results"
+        - "migration_status.results.results | count > 0"
         # Pod's 'Complete' status must be True
         - "migration_status.results.results | lib_utils_oo_collect(attribute='status.conditions') | lib_utils_oo_collect(attribute='status', filters={'type': 'Complete'}) | map('bool') | select | list | count == 1"
       delay: 10

roles/lib_utils/callback_plugins/aa_version_requirement.py

@@ -29,7 +29,7 @@ else:
 
 
 # Set to minimum required Ansible version
-REQUIRED_VERSION = '2.4.3.0'
+REQUIRED_VERSION = '2.6.0'
 DESCRIPTION = "Supported versions: %s or newer" % REQUIRED_VERSION
 
 

roles/openshift_health_checker/test/action_plugin_test.py

@@ -50,15 +50,27 @@ def fake_check(name='fake_check', tags=None, is_active=True, run_return=None, ru
 @pytest.fixture
 def plugin():
     task = FakeTask('openshift_health_check', {'checks': ['fake_check']})
-    plugin = ActionModule(task, None, PlayContext(), None, None, None)
+    plugin = ActionModule(task, FakeConnection(), PlayContext(), None, None, None)
     return plugin
 
 
+class FakeShell(object):
+    def __init__(self):
+        self.tmpdir = None
+
+
+class FakeConnection(object):
+    def __init__(self):
+        self._shell = FakeShell()
+
+
 class FakeTask(object):
     def __init__(self, action, args):
         self.action = action
         self.args = args
         self.async = 0
+        self.async_val = 0
+        self._supports_async = True
 
 
 @pytest.fixture
@@ -149,7 +161,7 @@ def test_action_plugin_skip_disabled_checks(to_disable, plugin, task_vars, monke
 
 def test_action_plugin_run_list_checks(monkeypatch):
     task = FakeTask('openshift_health_check', {'checks': []})
-    plugin = ActionModule(task, None, PlayContext(), None, None, None)
+    plugin = ActionModule(task, FakeConnection(), PlayContext(), None, None, None)
     monkeypatch.setattr(plugin, 'load_known_checks', lambda *_: {})
     result = plugin.run()