From 175a337e012a02a4d87ce47bbb8bcb82e839342d Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 8 Feb 2019 09:07:11 -0800 Subject: [PATCH] Handle registry role running under py3 Also, correct the host_vars filename. Again. Also, make sure we run the test on changes to the host_vars filename. Change-Id: I95fb61531bae677f5c68f4e56ed718da6c507eb9 --- .zuul.yaml | 1 + ...ry01.opendev.org => insecure-ci-registry01.opendev.org.yaml} | 0 playbooks/roles/registry/tasks/main.yaml | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename playbooks/host_vars/{insecure-ci-registry01.opendev.org => insecure-ci-registry01.opendev.org.yaml} (100%) diff --git a/.zuul.yaml b/.zuul.yaml index f4b797c05b..4f5f02d124 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -495,6 +495,7 @@ files: - .zuul.yaml - playbooks/group_vars/registry.yaml + - ^playbooks/host_vars/insecure-ci-registry\d+.opendev.org.yaml - playbooks/zuul/templates/group_vars/registry.yaml.j2 - playbooks/roles/registry/ - testinfra/test_registry.py diff --git a/playbooks/host_vars/insecure-ci-registry01.opendev.org b/playbooks/host_vars/insecure-ci-registry01.opendev.org.yaml similarity index 100% rename from playbooks/host_vars/insecure-ci-registry01.opendev.org rename to playbooks/host_vars/insecure-ci-registry01.opendev.org.yaml diff --git a/playbooks/roles/registry/tasks/main.yaml b/playbooks/roles/registry/tasks/main.yaml index 1121dff67e..0aafb634d3 100644 --- a/playbooks/roles/registry/tasks/main.yaml +++ b/playbooks/roles/registry/tasks/main.yaml @@ -13,7 +13,7 @@ - name: Install passlib package: name: - - python-passlib + - python3-passlib state: present - name: Write htpassword file htpasswd: