]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
ci: test on ansible 2.4.2 v3.0.17
authorSébastien Han <seb@redhat.com>
Thu, 21 Dec 2017 18:57:01 +0000 (19:57 +0100)
committerGuillaume Abrioux <gabrioux@redhat.com>
Fri, 12 Jan 2018 14:23:23 +0000 (15:23 +0100)
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 7ba25b20dcb199f81666b34cae6c1b95c30b1033)
Signed-off-by: Sébastien Han <seb@redhat.com>
ceph-ansible.spec.in
docs/source/index.rst
docs/source/testing/running.rst
tox.ini

index 237075c50acb650e8a708064e6fbac051d360deb..5611419303ef9f6a6fdabe856174459e599a4e3b 100644 (file)
@@ -16,10 +16,10 @@ Obsoletes:      ceph-iscsi-ansible <= 1.5
 
 BuildArch:      noarch
 
-BuildRequires: ansible >= 2.4.1.0
+BuildRequires: ansible >= 2.4.2.0
 BuildRequires: python2-devel
 
-Requires: ansible >= 2.4.1.0
+Requires: ansible >= 2.4.2.0
 Requires: python-netaddr
 
 %description
index b482c81effaf3d5ece604d02b27d375d1a32c430..9201e7301c478fd89274b1fddddc239b9f807bd5 100644 (file)
@@ -66,9 +66,9 @@ The ``master`` branch should be considered experimental and used with caution.
   ``2.1`` and ``2.2.2``.
 
 - ``stable-3.0`` Support for ceph versions ``jewel`` and ``luminous``. This branch supports ansible versions
-  ``2.3.1``, ``2.3.2`` and ``2.4.1``.
+  ``2.3.1``, ``2.3.2`` and ``2.4.2``.
 
-- ``master`` Support for ceph versions ``jewel``, and ``luminous``. This branch supports ansible version ``2.4.1``.
+- ``master`` Support for ceph versions ``jewel``, and ``luminous``. This branch supports ansible version ``2.4.2``.
 
 Configuration and Usage
 =======================
index d18bc722a7f328cea648373a81a258c616ecb2cf..7864380b967161868b8b03be3ed7fb92a56d2233 100644 (file)
@@ -60,9 +60,9 @@ end.
 
 The output would look something similar to this trimmed version::
 
-    kraken-ansible2.2-xenial_cluster create: /Users/alfredo/python/upstream/ceph-ansible/.tox/kraken-ansible2.2-xenial_cluster
-    kraken-ansible2.2-xenial_cluster installdeps: ansible==2.2.2, -r/Users/alfredo/python/upstream/ceph-ansible/tests/requirements.txt
-    kraken-ansible2.2-xenial_cluster runtests: commands[0] | vagrant up --no-provision --provider=virtualbox
+    luminous-ansible2.4-xenial_cluster create: /Users/alfredo/python/upstream/ceph-ansible/.tox/luminous-ansible2.4-xenial_cluster
+    luminous-ansible2.4-xenial_cluster installdeps: ansible==2.4.2, -r/Users/alfredo/python/upstream/ceph-ansible/tests/requirements.txt
+    luminous-ansible2.4-xenial_cluster runtests: commands[0] | vagrant up --no-provision --provider=virtualbox
     Bringing machine 'client0' up with 'virtualbox' provider...
     Bringing machine 'rgw0' up with 'virtualbox' provider...
     Bringing machine 'mds0' up with 'virtualbox' provider...
diff --git a/tox.ini b/tox.ini
index d35ed0fac0c2955cfc7d12a4dbd9fb7d59cf987c..712b734ebab36842ec48b92d36da5ccc936f3cc9 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -154,7 +154,7 @@ deps=
   ansible2.2: -r{toxinidir}/tests/requirements2.2.txt
   ansible2.3: ansible==2.3.1
   ansible2.3: -r{toxinidir}/tests/requirements2.2.txt
-  ansible2.4: ansible==2.4.1
+  ansible2.4: ansible==2.4.2
   ansible2.4: -r{toxinidir}/tests/requirements2.4.txt
 changedir=
   # tests a 1 mon, 1 osd, 1 mds and 1 rgw xenial cluster using non-collocated OSD scenario