From 4c4c499b8aa209d3cc14c75c9bd2d2f00075d059 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 3 May 2023 10:27:12 -0700 Subject: [PATCH] Pin python requests when installing docker-compose New urllib3 and python requests break python docker-compose. Pin requests back which should use an older urllib3. Hopefully this fixes docker-compose. Note this should probably only be used as a temporary workaround. A more permanent fix should change the way we install docker-compose. Change-Id: Ib28a42c033aeccb6a13f179bb5e06e80304de528 --- playbooks/roles/grafana/tasks/main.yaml | 5 +++++ playbooks/roles/install-docker/tasks/main.yaml | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/playbooks/roles/grafana/tasks/main.yaml b/playbooks/roles/grafana/tasks/main.yaml index e68e3a51c4..6d70364923 100644 --- a/playbooks/roles/grafana/tasks/main.yaml +++ b/playbooks/roles/grafana/tasks/main.yaml @@ -111,5 +111,10 @@ shell: cmd: docker image prune -f +- name: Wait for grafana to be up and running + wait_for: + timeout: 60 + port: 3000 + - name: Import dashboards to container command: '/usr/local/bin/update-grafana-dashboards' diff --git a/playbooks/roles/install-docker/tasks/main.yaml b/playbooks/roles/install-docker/tasks/main.yaml index 1951ab312e..c4d5539d56 100644 --- a/playbooks/roles/install-docker/tasks/main.yaml +++ b/playbooks/roles/install-docker/tasks/main.yaml @@ -40,7 +40,9 @@ - name: Install docker-compose pip: - name: docker-compose + name: + - requests<2.30.0 + - docker-compose state: present executable: pip3