From b1ab436081352c44e497f2ec15f93d5d89b2d5b4 Mon Sep 17 00:00:00 2001 From: jmoore Date: Fri, 2 Feb 2018 12:00:22 +0100 Subject: [PATCH 1/6] Bump to ansible 2.4 --- setup.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 137c5e4..b857658 100755 --- a/setup.py +++ b/setup.py @@ -68,8 +68,11 @@ # requirements files see: # https://packaging.python.org/en/latest/requirements.html install_requires=[ - 'ansible==2.3.2', + 'ansible==2.4', 'docker', - 'molecule==1.25.1', + 'docker-compose', + 'molecule==1.25', + 'os_client_config', + 'shade', ], ) From 6f7c0398770e08bd54b8777158507620c164c6ed Mon Sep 17 00:00:00 2001 From: jmoore Date: Fri, 2 Feb 2018 13:20:45 +0100 Subject: [PATCH 2/6] Bump molecule to 2.4+ as well --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b857658..95d0970 100755 --- a/setup.py +++ b/setup.py @@ -71,7 +71,7 @@ 'ansible==2.4', 'docker', 'docker-compose', - 'molecule==1.25', + 'molecule>=2.4 'os_client_config', 'shade', ], From 248bb37c5ea5f966c6658cc0e8b531a6b5496604 Mon Sep 17 00:00:00 2001 From: jmoore Date: Fri, 2 Feb 2018 13:27:35 +0100 Subject: [PATCH 3/6] Update repository list --- .travis.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7397774..64bc942 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,13 +26,18 @@ script: ### GENERATED ### env: +- ROLE=analysis-tools - ROLE=basedeps - ROLE=cadvisor - ROLE=celery-docker +- ROLE=cli-utils +- ROLE=debug-dumpallvars +- ROLE=devspace - ROLE=docker +- ROLE=docker-slack-notifier - ROLE=docker-tools +- ROLE=fluentd - ROLE=haproxy -# Syntax only - ROLE=hosts-populate - ROLE=ice - ROLE=java @@ -43,14 +48,15 @@ env: - ROLE=munin - ROLE=munin-node - ROLE=mysql-backup +- ROLE=network - ROLE=network-cloud-interfaces - ROLE=nfs-mount -# Syntax only - ROLE=nfs-share - ROLE=nginx - ROLE=nginx-proxy - ROLE=nginx-ssl-selfsigned - ROLE=omego +- ROLE=omero-common - ROLE=omero-logmonitor - ROLE=omero-python-deps - ROLE=omero-server @@ -60,7 +66,12 @@ env: - ROLE=omero-web-runtime - ROLE=openstack-volume-storage - ROLE=postgresql +- ROLE=prometheus +- ROLE=prometheus-jmx +- ROLE=prometheus-node +- ROLE=prometheus-postgres - ROLE=python-pydata +- ROLE=python-virtualenv-upstream - ROLE=reboot-server - ROLE=redis - ROLE=rsync-server From 707f1f1d0179482dadebf203e9076b93a32bc640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= Date: Mon, 14 May 2018 08:35:01 +0100 Subject: [PATCH 4/6] Fix setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 95d0970..0245413 100755 --- a/setup.py +++ b/setup.py @@ -71,7 +71,7 @@ 'ansible==2.4', 'docker', 'docker-compose', - 'molecule>=2.4 + 'molecule>=2.4', 'os_client_config', 'shade', ], From def0bdca523b369e763b1df805b0edb48d24e598 Mon Sep 17 00:00:00 2001 From: jmoore Date: Thu, 13 Sep 2018 11:11:56 +0200 Subject: [PATCH 5/6] Add docker-py --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 0245413..6534870 100755 --- a/setup.py +++ b/setup.py @@ -70,6 +70,7 @@ install_requires=[ 'ansible==2.4', 'docker', + 'docker-py', 'docker-compose', 'molecule>=2.4', 'os_client_config', From 8ff36479a7c1308b094d0e6f4c2b796a1032f682 Mon Sep 17 00:00:00 2001 From: jmoore Date: Thu, 13 Sep 2018 11:12:19 +0200 Subject: [PATCH 6/6] Revert .travis.yml changes --- .travis.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 64bc942..7397774 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,18 +26,13 @@ script: ### GENERATED ### env: -- ROLE=analysis-tools - ROLE=basedeps - ROLE=cadvisor - ROLE=celery-docker -- ROLE=cli-utils -- ROLE=debug-dumpallvars -- ROLE=devspace - ROLE=docker -- ROLE=docker-slack-notifier - ROLE=docker-tools -- ROLE=fluentd - ROLE=haproxy +# Syntax only - ROLE=hosts-populate - ROLE=ice - ROLE=java @@ -48,15 +43,14 @@ env: - ROLE=munin - ROLE=munin-node - ROLE=mysql-backup -- ROLE=network - ROLE=network-cloud-interfaces - ROLE=nfs-mount +# Syntax only - ROLE=nfs-share - ROLE=nginx - ROLE=nginx-proxy - ROLE=nginx-ssl-selfsigned - ROLE=omego -- ROLE=omero-common - ROLE=omero-logmonitor - ROLE=omero-python-deps - ROLE=omero-server @@ -66,12 +60,7 @@ env: - ROLE=omero-web-runtime - ROLE=openstack-volume-storage - ROLE=postgresql -- ROLE=prometheus -- ROLE=prometheus-jmx -- ROLE=prometheus-node -- ROLE=prometheus-postgres - ROLE=python-pydata -- ROLE=python-virtualenv-upstream - ROLE=reboot-server - ROLE=redis - ROLE=rsync-server